Merge "Disable 'remove' option while setting is selected" into pi-dev (24cfa88e) · Commits · e / os / android_packages_apps_Settings

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
		ZenModeVisEffectsCustomPreferenceController custom =
		use(ZenModeVisEffectsCustomPreferenceController.class);
		custom.setShownByMenu(mShowMenuSelected);
		custom.displayPreference(getPreferenceScreen());

		if (mShowMenuSelected) {
		custom.select();
		@@ -80,14 +81,20 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im

		@Override
		public void onPrepareOptionsMenu(Menu menu) {
		if (mShowMenuSelected && !use(ZenModeVisEffectsCustomPreferenceController.class)
		.areCustomOptionsSelected()) {
		if (mShowMenuSelected) {
		menu.findItem(APP_MENU_SHOW_CUSTOM)
		.setTitle(R.string.zen_mode_restrict_notifications_disable_custom);
		} else {
		menu.findItem(APP_MENU_SHOW_CUSTOM)
		.setTitle(R.string.zen_mode_restrict_notifications_enable_custom);
		}

		if (mShowMenuSelected && use(ZenModeVisEffectsCustomPreferenceController.class)
		.areCustomOptionsSelected()) {
		menu.findItem(APP_MENU_SHOW_CUSTOM).setEnabled(false);
		} else {
		menu.findItem(APP_MENU_SHOW_CUSTOM).setEnabled(true);
		}
		}

		@Override