PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'Recent Conversations' to the conversation page

Browse Source 
Test: atest
Bug: 171191376
Change-Id: Id7208312dff0cc022c2f16b3872fae1a9dc09ed7
This commit is contained in:
Julia Reynolds
2020-10-19 16:21:23 -04:00
parent 2e49b2e639
commit 0aef57d67e
11 changed files with 711 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/NotificationBackend.java
View File

@@ -541,6 +541,15 @@ public class NotificationBackend {
}
}
public void createConversationNotificationChannel(String pkg, int uid,
NotificationChannel parent, String conversationId) {
try {
sINM.createConversationNotificationChannelForPackage(pkg, uid, parent, conversationId);
} catch (Exception e) {
Log.w(TAG, "Error calling NoMan", e);
}
}
public ShortcutInfo getConversationInfo(Context context, String pkg, int uid, String id) {
LauncherApps la = context.getSystemService(LauncherApps.class);

12
src/com/android/settings/notification/app/ConversationListSettings.java
View File

@@ -16,8 +16,10 @@
package com.android.settings.notification.app;
import android.app.people.IPeopleManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.ServiceManager;
import android.util.Log;
import com.android.settings.R;
@@ -33,8 +35,15 @@ public class ConversationListSettings extends DashboardFragment {
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
NotificationBackend mBackend = new NotificationBackend();
IPeopleManager mPs;
protected List<AbstractPreferenceController> mControllers = new ArrayList<>();
public ConversationListSettings() {
mPs = IPeopleManager.Stub.asInterface(
ServiceManager.getService(Context.PEOPLE_SERVICE));
}
@Override
public int getMetricsCategory() {
return SettingsEnums.NOTIFICATION_CONVERSATION_LIST_SETTINGS;
@@ -53,9 +62,10 @@ public class ConversationListSettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mControllers = new ArrayList<>();
mControllers.add(new NoConversationsPreferenceController(context, mBackend));
mControllers.add(new NoConversationsPreferenceController(context, mBackend, mPs));
mControllers.add(new PriorityConversationsPreferenceController(context, mBackend));
mControllers.add(new AllConversationsPreferenceController(context, mBackend));
mControllers.add(new RecentConversationsPreferenceController(context, mBackend, mPs));
return new ArrayList<>(mControllers);
}
}

23
src/com/android/settings/notification/app/NoConversationsPreferenceController.java
View File

@@ -16,9 +16,12 @@
package com.android.settings.notification.app;
import android.app.people.IPeopleManager;
import android.content.Context;
import android.os.AsyncTask;
import android.os.RemoteException;
import android.service.notification.ConversationChannelWrapper;
import android.util.Log;
import android.view.View;
import androidx.preference.Preference;
@@ -27,17 +30,18 @@ import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.widget.LayoutPreference;
import java.util.List;
public class NoConversationsPreferenceController extends ConversationListPreferenceController {
private static String TAG = "NoConversationsPC";
private static final String KEY = "no_conversations";
private List<ConversationChannelWrapper> mConversations;
private IPeopleManager mPs;
private int mConversationCount = 0;
public NoConversationsPreferenceController(Context context,
NotificationBackend backend) {
NotificationBackend backend, IPeopleManager ps) {
super(context, backend);
mPs = ps;
}
@Override
@@ -67,7 +71,12 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... unused) {
mConversations = mBackend.getConversations(false).getList();
mConversationCount = mBackend.getConversations(false).getList().size();
try {
mConversationCount += mPs.getRecentConversations().getList().size();
} catch (RemoteException e) {
Log.w(TAG, "Error calling PS", e);
}
return null;
}
@@ -76,9 +85,9 @@ public class NoConversationsPreferenceController extends ConversationListPrefere
if (mContext == null) {
return;
}
pref.findViewById(R.id.onboarding).setVisibility(mConversations.size() == 0
pref.findViewById(R.id.onboarding).setVisibility(mConversationCount == 0
? View.VISIBLE : View.GONE);
preference.setVisible(mConversations.size() == 0);
preference.setVisible(mConversationCount == 0);
}
}.execute();
}

80
src/com/android/settings/notification/app/RecentConversationPreference.java Normal file
View File

@@ -0,0 +1,80 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.app;
import android.content.Context;
import android.view.View;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference;
import com.google.common.annotations.VisibleForTesting;
public class RecentConversationPreference extends TwoTargetPreference {
private OnClearClickListener mOnClearClickListener;
private View mClearView;
public interface OnClearClickListener {
void onClear();
}
public RecentConversationPreference(Context context) {
super(context);
}
public void setOnClearClickListener(
OnClearClickListener onClearClickListener) {
mOnClearClickListener = onClearClickListener;
}
@VisibleForTesting
View getClearView() {
return mClearView;
}
@Override
protected int getSecondTargetResId() {
return R.layout.preference_widget_clear;
}
@VisibleForTesting
int getClearId() {
return R.id.clear_button;
}
@VisibleForTesting
boolean hasClearListener() {
return mOnClearClickListener != null;
}
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
final View widgetFrame = view.findViewById(android.R.id.widget_frame);
widgetFrame.setVisibility(mOnClearClickListener != null ? View.VISIBLE : View.GONE);
mClearView = view.findViewById(getClearId());
mClearView.setOnClickListener(v -> {
if (mOnClearClickListener != null) {
mOnClearClickListener.onClear();
}
});
}
}

236
src/com/android/settings/notification/app/RecentConversationsPreferenceController.java Normal file
View File

@@ -0,0 +1,236 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.notification.app;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import android.app.people.ConversationChannel;
import android.app.people.IPeopleManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.ShortcutInfo;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog;
import android.widget.Button;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.LayoutPreference;
import java.text.Collator;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class RecentConversationsPreferenceController extends AbstractPreferenceController {
private static final String TAG = "RecentConversationsPC";
private static final String KEY = "recent_conversations";
private List<ConversationChannel> mConversations;
private final IPeopleManager mPs;
private final NotificationBackend mBackend;
public RecentConversationsPreferenceController(Context context, NotificationBackend backend,
IPeopleManager ps) {
super(context);
mBackend = backend;
mPs = ps;
}
@Override
public String getPreferenceKey() {
return KEY;
}
@Override
public boolean isAvailable() {
return true;
}
Preference getClearAll(PreferenceGroup parent) {
LayoutPreference pref = new LayoutPreference(
mContext, R.layout.conversations_clear_recents);
pref.setOrder(1);
Button button = pref.findViewById(R.id.conversation_settings_clear_recents);
button.setOnClickListener(v -> {
try {
mPs.removeAllRecentConversations();
} catch (RemoteException e) {
Slog.w(TAG, "Could not clear recents", e);
}
updateState(parent);
});
return pref;
}
@Override
public void updateState(Preference preference) {
PreferenceCategory pref = (PreferenceCategory) preference;
// Load conversations
new AsyncTask<Void, Void, Void>() {
@Override
protected Void doInBackground(Void... unused) {
try {
mConversations = mPs.getRecentConversations().getList();
} catch (RemoteException e) {
Slog.w(TAG, "Could get recents", e);
}
Collections.sort(mConversations, mConversationComparator);
return null;
}
@Override
protected void onPostExecute(Void unused) {
if (mContext == null) {
return;
}
populateList(mConversations, pref);
}
}.execute();
}
protected void populateList(List<ConversationChannel> conversations,
PreferenceGroup containerGroup) {
containerGroup.removeAll();
if (conversations != null) {
populateConversations(conversations, containerGroup);
}
if (containerGroup.getPreferenceCount() == 0) {
containerGroup.setVisible(false);
} else {
containerGroup.setVisible(true);
Preference clearAll = getClearAll(containerGroup);
if (clearAll != null) {
containerGroup.addPreference(clearAll);
}
}
}
protected void populateConversations(List<ConversationChannel> conversations,
PreferenceGroup containerGroup) {
int order = 100;
for (ConversationChannel conversation : conversations) {
if (conversation.getParentNotificationChannel().getImportance() == IMPORTANCE_NONE
|| (conversation.getParentNotificationChannelGroup() != null
&& conversation.getParentNotificationChannelGroup().isBlocked())) {
continue;
}
containerGroup.addPreference(
createConversationPref(containerGroup, conversation, order++));
}
}
protected Preference createConversationPref(PreferenceGroup parent,
final ConversationChannel conversation, int order) {
final String pkg = conversation.getShortcutInfo().getPackage();
final int uid = conversation.getUid();
final String conversationId = conversation.getShortcutInfo().getId();
RecentConversationPreference pref = new RecentConversationPreference(mContext);
if (!conversation.hasActiveNotifications()) {
pref.setOnClearClickListener(() -> {
try {
mPs.removeRecentConversation(pkg, UserHandle.getUserId(uid), conversationId);
parent.removePreference(pref);
} catch (RemoteException e) {
Slog.w(TAG, "Could not clear recent", e);
}
});
}
pref.setOrder(order);
pref.setTitle(getTitle(conversation));
pref.setSummary(getSummary(conversation));
pref.setIcon(mBackend.getConversationDrawable(mContext, conversation.getShortcutInfo(),
pkg, uid, false));
pref.setKey(conversation.getParentNotificationChannel().getId()
+ ":" + conversationId);
pref.setOnPreferenceClickListener(preference -> {
mBackend.createConversationNotificationChannel(
pkg, uid,
conversation.getParentNotificationChannel(),
conversationId);
getSubSettingLauncher(conversation, pref.getTitle()).launch();
return true;
});
return pref;
}
CharSequence getSummary(ConversationChannel conversation) {
return conversation.getParentNotificationChannelGroup() == null
? conversation.getParentNotificationChannel().getName()
: mContext.getString(R.string.notification_conversation_summary,
conversation.getParentNotificationChannel().getName(),
conversation.getParentNotificationChannelGroup().getName());
}
CharSequence getTitle(ConversationChannel conversation) {
ShortcutInfo si = conversation.getShortcutInfo();
return si.getLabel();
}
SubSettingLauncher getSubSettingLauncher(ConversationChannel conversation,
CharSequence title) {
Bundle channelArgs = new Bundle();
channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, conversation.getUid());
channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME,
conversation.getShortcutInfo().getPackage());
channelArgs.putString(Settings.EXTRA_CHANNEL_ID,
conversation.getParentNotificationChannel().getId());
channelArgs.putString(Settings.EXTRA_CONVERSATION_ID,
conversation.getShortcutInfo().getId());
return new SubSettingLauncher(mContext)
.setDestination(ChannelNotificationSettings.class.getName())
.setArguments(channelArgs)
.setExtras(channelArgs)
.setUserHandle(UserHandle.getUserHandleForUid(conversation.getUid()))
.setTitleText(title)
.setSourceMetricsCategory(SettingsEnums.NOTIFICATION_CONVERSATION_LIST_SETTINGS);
}
protected Comparator<ConversationChannel> mConversationComparator =
new Comparator<ConversationChannel>() {
private final Collator sCollator = Collator.getInstance();
@Override
public int compare(ConversationChannel o1, ConversationChannel o2) {
int labelComparison = sCollator.compare(o1.getShortcutInfo().getLabel(),
o2.getShortcutInfo().getLabel());
if (labelComparison == 0) {
return o1.getParentNotificationChannel().getId().compareTo(
o2.getParentNotificationChannel().getId());
}
return labelComparison;
}
};
}