Merge "Clean up DND slice in search." into qt-dev (12ee53f1) · Commits · e / os / android_packages_apps_Settings

res/xml/sound_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@
		settings:useAdminDisabledSummary="true"
		settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
		settings:allowDividerAbove="true"
		settings:controller="com.android.settings.notification.ZenModeSoundSettingsPreferenceController"/>
		settings:controller="com.android.settings.notification.ZenModePreferenceController"/>

		<Preference
		android:key="gesture_prevent_ringing_sound"

res/xml/zen_mode_settings.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="zen_mode_settings"
		android:title="@string/zen_mode_settings_title"
		settings:keywords="@string/keywords_zen_mode_settings">
		settings:searchable="false">

		<PreferenceCategory
		android:key="zen_mode_settings_category_behavior"
		@@ -66,11 +66,13 @@

		<!-- Turn on DND button -->
		<com.android.settingslib.widget.LayoutPreference
		android:key="zen_mode_settings_button_container"
		android:key="zen_mode_toggle"
		android:title="@string/zen_mode_settings_title"
		android:selectable="false"
		android:layout="@layout/zen_mode_settings_button"
		settings:allowDividerAbove="true"
		settings:allowDividerBelow="true"/>
		settings:allowDividerBelow="true"
		settings:keywords="@string/keywords_zen_mode_settings"/>

		<!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
		<com.android.settingslib.widget.FooterPreference/>

src/com/android/settings/notification/ZenModeButtonPreferenceController.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -33,11 +33,12 @@ import com.android.settingslib.widget.LayoutPreference;
		public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
		implements PreferenceControllerMixin {

		public static final String KEY = "zen_mode_toggle";

		private static final String TAG = "EnableZenModeButton";
		protected static final String KEY = "zen_mode_settings_button_container";
		private final FragmentManager mFragment;
		private Button mZenButtonOn;
		private Button mZenButtonOff;
		private FragmentManager mFragment;

		public ZenModeButtonPreferenceController(Context context, Lifecycle lifecycle, FragmentManager
		fragment) {
		@@ -60,13 +61,13 @@ public class ZenModeButtonPreferenceController extends AbstractZenModePreference
		super.updateState(preference);

		if (null == mZenButtonOn) {
		mZenButtonOn = (Button) ((LayoutPreference) preference)
		mZenButtonOn = ((LayoutPreference) preference)
		.findViewById(R.id.zen_mode_settings_turn_on_button);
		updateZenButtonOnClickListener();
		}

		if (null == mZenButtonOff) {
		mZenButtonOff = (Button) ((LayoutPreference) preference)
		mZenButtonOff = ((LayoutPreference) preference)
		.findViewById(R.id.zen_mode_settings_turn_off_button);
		mZenButtonOff.setOnClickListener(v -> {
		mMetricsFeatureProvider.action(mContext,

src/com/android/settings/notification/ZenModeSettings.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
		public List<String> getNonIndexableKeys(Context context) {
		List<String> keys = super.getNonIndexableKeys(context);
		keys.add(ZenModeDurationPreferenceController.KEY);
		keys.add(ZenModeButtonPreferenceController.KEY);
		return keys;
		}

src/com/android/settings/notification/ZenModeSliceBuilder.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -18,8 +18,6 @@ package com.android.settings.notification;

		import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;

		import static com.android.settings.notification.ZenModeSoundSettingsPreferenceController.ZEN_MODE_KEY;

		import android.annotation.ColorInt;
		import android.app.NotificationManager;
		import android.app.PendingIntent;
		@@ -47,6 +45,8 @@ public class ZenModeSliceBuilder {

		private static final String TAG = "ZenModeSliceBuilder";

		private static final String ZEN_MODE_SLICE_KEY = ZenModeButtonPreferenceController.KEY;

		/**
		* Action notifying a change on the Zen Mode Slice.
		*/
		@@ -78,7 +78,8 @@ public class ZenModeSliceBuilder {
		final PendingIntent primaryAction = getPrimaryAction(context);
		final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryAction,
		(IconCompat) null /* icon */, ListBuilder.ICON_IMAGE, title);
		final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction, null /* actionTitle */,
		final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
		null /* actionTitle */,
		isZenModeEnabled);

		return new ListBuilder(context, CustomSliceRegistry.ZEN_MODE_SLICE_URI,
		@@ -110,10 +111,10 @@ public class ZenModeSliceBuilder {
		}

		public static Intent getIntent(Context context) {
		final Uri contentUri = new Uri.Builder().appendPath(ZEN_MODE_KEY).build();
		final Uri contentUri = new Uri.Builder().appendPath(ZEN_MODE_SLICE_KEY).build();
		final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
		return SliceBuilderUtils.buildSearchResultPageIntent(context,
		ZenModeSettings.class.getName(), ZEN_MODE_KEY, screenTitle,
		ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle,
		SettingsEnums.NOTIFICATION_ZEN_MODE)
		.setClassName(context.getPackageName(), SubSettings.class.getName())
		.setData(contentUri);