Merge "Fix Conversation page flickers when back" into tm-dev
diff --git a/src/com/android/settings/notification/app/ConversationListPreferenceController.java b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
index b609a9a..29f0dea 100644
--- a/src/com/android/settings/notification/app/ConversationListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationListPreferenceController.java
@@ -41,8 +41,7 @@
public abstract class ConversationListPreferenceController extends AbstractPreferenceController {
- private static final String KEY = "all_conversations";
-
+ private static final String SUMMARY_KEY_SUFFIX = "_summary";
protected final NotificationBackend mBackend;
public ConversationListPreferenceController(Context context,
@@ -52,11 +51,6 @@
}
@Override
- public String getPreferenceKey() {
- return KEY;
- }
-
- @Override
public boolean isAvailable() {
return true;
}
@@ -72,6 +66,7 @@
if (containerGroup.getPreferenceCount() != 0) {
Preference summaryPref = getSummaryPreference();
if (summaryPref != null) {
+ summaryPref.setKey(getPreferenceKey() + SUMMARY_KEY_SUFFIX);
containerGroup.addPreference(summaryPref);
}
containerGroup.setVisible(true);
diff --git a/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
index 1ceb45c..4d8cefe 100644
--- a/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
@@ -23,7 +23,6 @@
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;
@@ -51,6 +50,7 @@
private static final String TAG = "RecentConversationsPC";
private static final String KEY = "recent_conversations";
+ private static final String CLEAR_ALL_KEY_SUFFIX = "_clear_all";
private List<ConversationChannel> mConversations;
private final IPeopleManager mPs;
private final NotificationBackend mBackend;
@@ -72,9 +72,11 @@
return true;
}
+ //TODO(b/233325816): Use ButtonPreference instead.
LayoutPreference getClearAll(PreferenceGroup parent) {
LayoutPreference pref = new LayoutPreference(
mContext, R.layout.conversations_clear_recents);
+ pref.setKey(getPreferenceKey() + CLEAR_ALL_KEY_SUFFIX);
pref.setOrder(1);
Button button = pref.findViewById(R.id.conversation_settings_clear_recents);
button.setOnClickListener(v -> {