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 am: 24cfa88e19

Browse Source 
am: 035e2006e8

Change-Id: Ibae065e51330af2c7abb72a10ac84d284666e4d2
This commit is contained in:
android-build-team Robot
2018-05-01 12:45:07 -07:00
committed by android-build-merger
parent 10b4bc01f1 035e2006e8
commit 979ece432a
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

@@ -67,6 +67,7 @@ public class ZenModeRestrictNotificationsSettings extends ZenModeSettingsBase im
ZenModeVisEffectsCustomPreferenceController custom =
use(ZenModeVisEffectsCustomPreferenceController.class);
custom.setShownByMenu(mShowMenuSelected);
custom.displayPreference(getPreferenceScreen());
if (mShowMenuSelected) {
custom.select();
@@ -82,14 +83,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