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

Merge "Disable 'remove' option while setting is selected" into pi-dev

Browse Source 
am: 24cfa88e19

Change-Id: I2f737729d9525623bc4b5edb5ff84cae07ee007e
This commit is contained in:
android-build-team Robot
2018-05-01 12:41:31 -07:00
committed by android-build-merger
parent cd3e50d4a5 24cfa88e19
commit 035e2006e8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
View File

@@ -65,6 +65,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
ZenModeVisEffectsCustomPreferenceController custom = ZenModeVisEffectsCustomPreferenceController custom =
use(ZenModeVisEffectsCustomPreferenceController.class); use(ZenModeVisEffectsCustomPreferenceController.class);
custom.setShownByMenu(mShowMenuSelected); custom.setShownByMenu(mShowMenuSelected);
custom.displayPreference(getPreferenceScreen());
if (mShowMenuSelected) { if (mShowMenuSelected) {
custom.select(); custom.select();
@@ -80,14 +81,20 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
@Override @Override
public void onPrepareOptionsMenu(Menu menu) { public void onPrepareOptionsMenu(Menu menu) {
if (mShowMenuSelected && !use(ZenModeVisEffectsCustomPreferenceController.class) if (mShowMenuSelected) {
.areCustomOptionsSelected()) {
menu.findItem(APP_MENU_SHOW_CUSTOM) menu.findItem(APP_MENU_SHOW_CUSTOM)
.setTitle(R.string.zen_mode_restrict_notifications_disable_custom); .setTitle(R.string.zen_mode_restrict_notifications_disable_custom);
} else { } else {
menu.findItem(APP_MENU_SHOW_CUSTOM) menu.findItem(APP_MENU_SHOW_CUSTOM)
.setTitle(R.string.zen_mode_restrict_notifications_enable_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 @Override