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

Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1

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

Change-Id: I5d43b367191f3c17bc9560c97dbe583a29585a72
This commit is contained in:
TreeHugger Robot
2021-04-30 14:27:14 +00:00
committed by Automerger Merge Worker
parent 390d29bf2c fb2e8837f1
commit 570ef9d8da
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/configure_notification_settings_v2.xml
View File

@@ -25,6 +25,7 @@
android:key="conversations"
android:order="1"
android:title="@string/conversations_category_title"
android:summary=" "
settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
android:fragment="com.android.settings.notification.app.ConversationListSettings"
/>
@@ -44,12 +45,18 @@
<!-- Placeholder for a list of recent apps -->
<com.android.settings.widget.PrimarySwitchPreference
android:key="app1"
android:title=" "
android:summary=" "
android:order="5"/>
<com.android.settings.widget.PrimarySwitchPreference
android:key="app2"
android:title=" "
android:summary=" "
android:order="6"/>
<com.android.settings.widget.PrimarySwitchPreference
android:key="app3"
android:title=" "
android:summary=" "
android:order="7"/>
<!-- See all apps button -->

3
src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
View File

@@ -149,6 +149,9 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC
@VisibleForTesting
void refreshUi(Context prefContext) {
((PrimarySwitchPreference) mCategory.findPreference(KEY_PLACEHOLDER + 1)).setChecked(true);
((PrimarySwitchPreference) mCategory.findPreference(KEY_PLACEHOLDER + 2)).setChecked(true);
((PrimarySwitchPreference) mCategory.findPreference(KEY_PLACEHOLDER + 3)).setChecked(true);
ThreadUtils.postOnBackgroundThread(() -> {
reloadData();
final List<NotifyingApp> recentApps = getDisplayableRecentAppList();