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

Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chaohui Wang
2022-05-21 02:28:32 +00:00
committed by Automerger Merge Worker
parent 2e995ee697 0d6569d199
commit 456a27bee3
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/app/ConversationListPreferenceController.java
View File

@@ -41,8 +41,7 @@ import java.util.List;
public abstract class ConversationListPreferenceController extends AbstractPreferenceController { 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; protected final NotificationBackend mBackend;
public ConversationListPreferenceController(Context context, public ConversationListPreferenceController(Context context,
@@ -51,11 +50,6 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
mBackend = backend; mBackend = backend;
} }
@Override
public String getPreferenceKey() {
return KEY;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return true; return true;
@@ -72,6 +66,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
if (containerGroup.getPreferenceCount() != 0) { if (containerGroup.getPreferenceCount() != 0) {
Preference summaryPref = getSummaryPreference(); Preference summaryPref = getSummaryPreference();
if (summaryPref != null) { if (summaryPref != null) {
summaryPref.setKey(getPreferenceKey() + SUMMARY_KEY_SUFFIX);
containerGroup.addPreference(summaryPref); containerGroup.addPreference(summaryPref);
} }
containerGroup.setVisible(true); containerGroup.setVisible(true);

4
src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.app.people.IPeopleManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutInfo;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
@@ -51,6 +50,7 @@ public class RecentConversationsPreferenceController extends AbstractPreferenceC
private static final String TAG = "RecentConversationsPC"; private static final String TAG = "RecentConversationsPC";
private static final String KEY = "recent_conversations"; private static final String KEY = "recent_conversations";
private static final String CLEAR_ALL_KEY_SUFFIX = "_clear_all";
private List<ConversationChannel> mConversations; private List<ConversationChannel> mConversations;
private final IPeopleManager mPs; private final IPeopleManager mPs;
private final NotificationBackend mBackend; private final NotificationBackend mBackend;
@@ -72,9 +72,11 @@ public class RecentConversationsPreferenceController extends AbstractPreferenceC
return true; return true;
} }
//TODO(b/233325816): Use ButtonPreference instead.
LayoutPreference getClearAll(PreferenceGroup parent) { LayoutPreference getClearAll(PreferenceGroup parent) {
LayoutPreference pref = new LayoutPreference( LayoutPreference pref = new LayoutPreference(
mContext, R.layout.conversations_clear_recents); mContext, R.layout.conversations_clear_recents);
pref.setKey(getPreferenceKey() + CLEAR_ALL_KEY_SUFFIX);
pref.setOrder(1); pref.setOrder(1);
Button button = pref.findViewById(R.id.conversation_settings_clear_recents); Button button = pref.findViewById(R.id.conversation_settings_clear_recents);
button.setOnClickListener(v -> { button.setOnClickListener(v -> {