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

Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1

Browse Source 
Change-Id: I8265d40d56c38c87bbf127ee88aab8bb30e60ffd
This commit is contained in:
Beverly
2020-04-02 17:56:52 +00:00
committed by Automerger Merge Worker
parent 76d263bdfc 3afe367fa1
commit 32084d621d
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/zen_mode_people_settings.xml
View File

@@ -25,6 +25,12 @@
android:key="zen_mode_settings_category_conversations" android:key="zen_mode_settings_category_conversations"
android:title="@string/zen_mode_conversations_section_title"> android:title="@string/zen_mode_conversations_section_title">
<!-- Senders image -->
<com.android.settingslib.widget.LayoutPreference
android:key="zen_mode_conversations_image"
android:layout="@layout/zen_mode_senders_overlay_image"
android:selectable="false"/>
<Preference <Preference
android:key="zen_mode_conversations" android:key="zen_mode_conversations"
android:title="@string/zen_mode_conversations_title" android:title="@string/zen_mode_conversations_title"

12
src/com/android/settings/notification/zen/ZenModePeopleSettings.java
View File

@@ -25,6 +25,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -47,12 +48,16 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
app = null; app = null;
} }
return buildPreferenceControllers( return buildPreferenceControllers(
context, getSettingsLifecycle(), app, this, getFragmentManager()); context, getSettingsLifecycle(), app, this, getFragmentManager(),
new NotificationBackend());
} }
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context, private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, Application app, Fragment host, FragmentManager fragmentManager) { Lifecycle lifecycle, Application app, Fragment host, FragmentManager fragmentManager,
NotificationBackend notificationBackend) {
List<AbstractPreferenceController> controllers = new ArrayList<>(); List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModeConversationsImagePreferenceController(context,
"zen_mode_conversations_image", lifecycle, notificationBackend));
controllers.add(new ZenModeConversationsPreferenceController(context, controllers.add(new ZenModeConversationsPreferenceController(context,
"zen_mode_conversations", lifecycle)); "zen_mode_conversations", lifecycle));
controllers.add(new ZenModeCallsPreferenceController(context, lifecycle, controllers.add(new ZenModeCallsPreferenceController(context, lifecycle,
@@ -83,7 +88,8 @@ public class ZenModePeopleSettings extends ZenModeSettingsBase implements Indexa
@Override @Override
public List<AbstractPreferenceController> createPreferenceControllers( public List<AbstractPreferenceController> createPreferenceControllers(
Context context) { Context context) {
return buildPreferenceControllers(context, null, null, null, null); return buildPreferenceControllers(context, null, null, null,
null, null);
} }
}; };
} }