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

Merge "Developer setting to enable notification channel warnings" into oc-dev am: 77bb0aaf96

Browse Source 
am: 984dad4ac6

Change-Id: Ica82b112388bd3f3f0a1e2e0281b8c1036d64934
This commit is contained in:
Geoffrey Pitsch
2017-05-23 15:26:39 +00:00
committed by android-build-merger
parent 5ab93ad700 984dad4ac6
commit 4ea6258200
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -226,6 +226,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
private static final String SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY = "show_notification_channel_warnings";
private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
@@ -325,6 +327,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mShowAllANRs;
private SwitchPreference mShowNotificationChannelWarnings;
private ColorModePreference mColorModePreference;
private SwitchPreference mForceResizable;
@@ -520,6 +524,11 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mAllPrefs.add(mShowAllANRs);
mResetSwitchPrefs.add(mShowAllANRs);
mShowNotificationChannelWarnings = (SwitchPreference) findPreference(
SHOW_NOTIFICATION_CHANNEL_WARNINGS_KEY);
mAllPrefs.add(mShowNotificationChannelWarnings);
mResetSwitchPrefs.add(mShowNotificationChannelWarnings);
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking);
@@ -785,6 +794,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateImmediatelyDestroyActivitiesOptions();
updateAppProcessLimitOptions();
updateShowAllANRsOptions();
updateShowNotificationChannelWarningsOptions();
mVerifyAppsOverUsbController.updatePreference();
updateOtaDisableAutomaticUpdateOptions();
updateBugreportOptions();
@@ -2264,6 +2274,19 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
}
private void writeShowNotificationChannelWarningsOptions() {
Settings.Global.putInt(getActivity().getContentResolver(),
Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS,
mShowNotificationChannelWarnings.isChecked() ? 1 : 0);
}
private void updateShowNotificationChannelWarningsOptions() {
final int defaultWarningEnabled = Build.IS_DEBUGGABLE ? 1 : 0;
updateSwitchPreference(mShowNotificationChannelWarnings, Settings.Global.getInt(
getActivity().getContentResolver(),
Settings.Global.SHOW_NOTIFICATION_CHANNEL_WARNINGS, defaultWarningEnabled) != 0);
}
private void confirmEnableOemUnlock() {
DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() {
@Override
@@ -2450,6 +2473,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) {
writeShowAllANRsOptions();
} else if (preference == mShowNotificationChannelWarnings) {
writeShowNotificationChannelWarningsOptions();
} else if (preference == mForceHardwareUi) {
writeHardwareUiOptions();
} else if (preference == mForceMsaa) {