diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-10-14 16:43:37 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-10-14 16:43:37 -0700 |
commit | 886387373e21ffe78ccbc9b032b18794e2ce826f (patch) | |
tree | 11c367adbc4789080f87db6254785f32fb646c32 /src/com/android/settings/DevelopmentSettings.java | |
parent | d8ae35ea50464da2f5c1933e831e0aced933d3b4 (diff) | |
download | packages_apps_Settings-886387373e21ffe78ccbc9b032b18794e2ce826f.zip packages_apps_Settings-886387373e21ffe78ccbc9b032b18794e2ce826f.tar.gz packages_apps_Settings-886387373e21ffe78ccbc9b032b18794e2ce826f.tar.bz2 |
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, use a Switch instead of a CheckBox for Developer Settings
Change-Id: I6a9b3fef879299a8ac5b57ff9c794b58022b79d9
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
-rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 213 |
1 files changed, 106 insertions, 107 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f5704c1..d410366 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -45,12 +45,12 @@ import android.os.StrictMode; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.text.TextUtils; @@ -65,7 +65,6 @@ import android.widget.TextView; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; -import dalvik.system.VMRuntime; import java.util.ArrayList; import java.util.Arrays; @@ -176,39 +175,39 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private boolean mHaveDebugSettings; private boolean mDontPokeProperties; - private CheckBoxPreference mEnableAdb; + private SwitchPreference mEnableAdb; private Preference mClearAdbKeys; - private CheckBoxPreference mEnableTerminal; + private SwitchPreference mEnableTerminal; private Preference mBugreport; - private CheckBoxPreference mBugreportInPower; - private CheckBoxPreference mKeepScreenOn; - private CheckBoxPreference mBtHciSnoopLog; - private CheckBoxPreference mEnableOemUnlock; - private CheckBoxPreference mAllowMockLocation; - private CheckBoxPreference mDebugViewAttributes; + private SwitchPreference mBugreportInPower; + private SwitchPreference mKeepScreenOn; + private SwitchPreference mBtHciSnoopLog; + private SwitchPreference mEnableOemUnlock; + private SwitchPreference mAllowMockLocation; + private SwitchPreference mDebugViewAttributes; private PreferenceScreen mPassword; private String mDebugApp; private Preference mDebugAppPref; - private CheckBoxPreference mWaitForDebugger; - private CheckBoxPreference mVerifyAppsOverUsb; - private CheckBoxPreference mWifiDisplayCertification; - private CheckBoxPreference mWifiVerboseLogging; - private CheckBoxPreference mWifiAggressiveHandover; - - private CheckBoxPreference mWifiAllowScansWithTraffic; - private CheckBoxPreference mStrictMode; - private CheckBoxPreference mPointerLocation; - private CheckBoxPreference mShowTouches; - private CheckBoxPreference mShowScreenUpdates; - private CheckBoxPreference mDisableOverlays; - private CheckBoxPreference mShowCpuUsage; - private CheckBoxPreference mForceHardwareUi; - private CheckBoxPreference mForceMsaa; - private CheckBoxPreference mShowHwScreenUpdates; - private CheckBoxPreference mShowHwLayersUpdates; - private CheckBoxPreference mDebugLayout; - private CheckBoxPreference mForceRtlLayout; + private SwitchPreference mWaitForDebugger; + private SwitchPreference mVerifyAppsOverUsb; + private SwitchPreference mWifiDisplayCertification; + private SwitchPreference mWifiVerboseLogging; + private SwitchPreference mWifiAggressiveHandover; + + private SwitchPreference mWifiAllowScansWithTraffic; + private SwitchPreference mStrictMode; + private SwitchPreference mPointerLocation; + private SwitchPreference mShowTouches; + private SwitchPreference mShowScreenUpdates; + private SwitchPreference mDisableOverlays; + private SwitchPreference mShowCpuUsage; + private SwitchPreference mForceHardwareUi; + private SwitchPreference mForceMsaa; + private SwitchPreference mShowHwScreenUpdates; + private SwitchPreference mShowHwLayersUpdates; + private SwitchPreference mDebugLayout; + private SwitchPreference mForceRtlLayout; private ListPreference mDebugHwOverdraw; private ListPreference mLogdSize; private ListPreference mTrackFrameTime; @@ -221,19 +220,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private ListPreference mSimulateColorSpace; - private CheckBoxPreference mUseNuplayer; - private CheckBoxPreference mUSBAudio; - private CheckBoxPreference mImmediatelyDestroyActivities; + private SwitchPreference mUseNuplayer; + private SwitchPreference mUSBAudio; + private SwitchPreference mImmediatelyDestroyActivities; private ListPreference mAppProcessLimit; - private CheckBoxPreference mShowAllANRs; + private SwitchPreference mShowAllANRs; private PreferenceScreen mProcessStats; private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>(); - private final ArrayList<CheckBoxPreference> mResetCbPrefs - = new ArrayList<CheckBoxPreference>(); + private final ArrayList<SwitchPreference> mResetSwitchPrefs + = new ArrayList<SwitchPreference>(); private final HashSet<Preference> mDisabledPrefs = new HashSet<Preference>(); // To track whether a confirmation dialog was clicked. @@ -268,7 +267,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment final PreferenceGroup debugDebuggingCategory = (PreferenceGroup) findPreference(DEBUG_DEBUGGING_CATEGORY_KEY); - mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB); + mEnableAdb = findAndInitSwitchPref(ENABLE_ADB); mClearAdbKeys = findPreference(CLEAR_ADB_KEYS); if (!SystemProperties.getBoolean("ro.adb.secure", false)) { if (debugDebuggingCategory != null) { @@ -276,23 +275,23 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } } mAllPrefs.add(mClearAdbKeys); - mEnableTerminal = findAndInitCheckboxPref(ENABLE_TERMINAL); + mEnableTerminal = findAndInitSwitchPref(ENABLE_TERMINAL); if (!isPackageInstalled(getActivity(), TERMINAL_APP_PACKAGE)) { debugDebuggingCategory.removePreference(mEnableTerminal); mEnableTerminal = null; } mBugreport = findPreference(BUGREPORT); - mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY); - mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON); - mBtHciSnoopLog = findAndInitCheckboxPref(BT_HCI_SNOOP_LOG); - mEnableOemUnlock = findAndInitCheckboxPref(ENABLE_OEM_UNLOCK); + mBugreportInPower = findAndInitSwitchPref(BUGREPORT_IN_POWER_KEY); + mKeepScreenOn = findAndInitSwitchPref(KEEP_SCREEN_ON); + mBtHciSnoopLog = findAndInitSwitchPref(BT_HCI_SNOOP_LOG); + mEnableOemUnlock = findAndInitSwitchPref(ENABLE_OEM_UNLOCK); if (!showEnableOemUnlockPreference()) { removePreference(mEnableOemUnlock); mEnableOemUnlock = null; } - mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION); - mDebugViewAttributes = findAndInitCheckboxPref(DEBUG_VIEW_ATTRIBUTES); + mAllowMockLocation = findAndInitSwitchPref(ALLOW_MOCK_LOCATION); + mDebugViewAttributes = findAndInitSwitchPref(DEBUG_VIEW_ATTRIBUTES); mPassword = (PreferenceScreen) findPreference(LOCAL_BACKUP_PASSWORD); mAllPrefs.add(mPassword); @@ -306,8 +305,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mDebugAppPref = findPreference(DEBUG_APP_KEY); mAllPrefs.add(mDebugAppPref); - mWaitForDebugger = findAndInitCheckboxPref(WAIT_FOR_DEBUGGER_KEY); - mVerifyAppsOverUsb = findAndInitCheckboxPref(VERIFY_APPS_OVER_USB_KEY); + mWaitForDebugger = findAndInitSwitchPref(WAIT_FOR_DEBUGGER_KEY); + mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY); if (!showVerifierSetting()) { if (debugDebuggingCategory != null) { debugDebuggingCategory.removePreference(mVerifyAppsOverUsb); @@ -315,25 +314,25 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mVerifyAppsOverUsb.setEnabled(false); } } - mStrictMode = findAndInitCheckboxPref(STRICT_MODE_KEY); - mPointerLocation = findAndInitCheckboxPref(POINTER_LOCATION_KEY); - mShowTouches = findAndInitCheckboxPref(SHOW_TOUCHES_KEY); - mShowScreenUpdates = findAndInitCheckboxPref(SHOW_SCREEN_UPDATES_KEY); - mDisableOverlays = findAndInitCheckboxPref(DISABLE_OVERLAYS_KEY); - mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY); - mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY); - mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY); + mStrictMode = findAndInitSwitchPref(STRICT_MODE_KEY); + mPointerLocation = findAndInitSwitchPref(POINTER_LOCATION_KEY); + mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY); + mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY); + mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY); + mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY); + mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY); + mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY); mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY); mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY); - mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY); - mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY); - mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY); - mForceRtlLayout = findAndInitCheckboxPref(FORCE_RTL_LAYOUT_KEY); + mShowHwScreenUpdates = findAndInitSwitchPref(SHOW_HW_SCREEN_UPDATES_KEY); + mShowHwLayersUpdates = findAndInitSwitchPref(SHOW_HW_LAYERS_UPDATES_KEY); + mDebugLayout = findAndInitSwitchPref(DEBUG_LAYOUT_KEY); + mForceRtlLayout = findAndInitSwitchPref(FORCE_RTL_LAYOUT_KEY); mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY); - mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY); - mWifiVerboseLogging = findAndInitCheckboxPref(WIFI_VERBOSE_LOGGING_KEY); - mWifiAggressiveHandover = findAndInitCheckboxPref(WIFI_AGGRESSIVE_HANDOVER_KEY); - mWifiAllowScansWithTraffic = findAndInitCheckboxPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY); + mWifiDisplayCertification = findAndInitSwitchPref(WIFI_DISPLAY_CERTIFICATION_KEY); + mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY); + mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY); + mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY); mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY); mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY); @@ -342,20 +341,20 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY); mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY); mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE); - mUseNuplayer = findAndInitCheckboxPref(USE_NUPLAYER_KEY); - mUSBAudio = findAndInitCheckboxPref(USB_AUDIO_KEY); + mUseNuplayer = findAndInitSwitchPref(USE_NUPLAYER_KEY); + mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY); - mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference( + mImmediatelyDestroyActivities = (SwitchPreference) findPreference( IMMEDIATELY_DESTROY_ACTIVITIES_KEY); mAllPrefs.add(mImmediatelyDestroyActivities); - mResetCbPrefs.add(mImmediatelyDestroyActivities); + mResetSwitchPrefs.add(mImmediatelyDestroyActivities); mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY); - mShowAllANRs = (CheckBoxPreference) findPreference( + mShowAllANRs = (SwitchPreference) findPreference( SHOW_ALL_ANRS_KEY); mAllPrefs.add(mShowAllANRs); - mResetCbPrefs.add(mShowAllANRs); + mResetSwitchPrefs.add(mShowAllANRs); Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY); if (hdcpChecking != null) { @@ -381,13 +380,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } } - private CheckBoxPreference findAndInitCheckboxPref(String key) { - CheckBoxPreference pref = (CheckBoxPreference) findPreference(key); + private SwitchPreference findAndInitSwitchPref(String key) { + SwitchPreference pref = (SwitchPreference) findPreference(key); if (pref == null) { throw new IllegalArgumentException("Cannot find preference with key = " + key); } mAllPrefs.add(pref); - mResetCbPrefs.add(pref); + mResetSwitchPrefs.add(pref); return pref; } @@ -482,8 +481,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment mSwitchBar.hide(); } - void updateCheckBox(CheckBoxPreference checkBox, boolean value) { - checkBox.setChecked(value); + void updateSwitchPreference(SwitchPreference switchPreference, boolean value) { + switchPreference.setChecked(value); mHaveDebugSettings |= value; } @@ -491,25 +490,25 @@ public class DevelopmentSettings extends SettingsPreferenceFragment final Context context = getActivity(); final ContentResolver cr = context.getContentResolver(); mHaveDebugSettings = false; - updateCheckBox(mEnableAdb, Settings.Global.getInt(cr, + updateSwitchPreference(mEnableAdb, Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) != 0); if (mEnableTerminal != null) { - updateCheckBox(mEnableTerminal, + updateSwitchPreference(mEnableTerminal, context.getPackageManager().getApplicationEnabledSetting(TERMINAL_APP_PACKAGE) - == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); + == PackageManager.COMPONENT_ENABLED_STATE_ENABLED); } - updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr, + updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0); - updateCheckBox(mKeepScreenOn, Settings.Global.getInt(cr, + updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); - updateCheckBox(mBtHciSnoopLog, Settings.Secure.getInt(cr, + updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0); if (mEnableOemUnlock != null) { - updateCheckBox(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); + updateSwitchPreference(mEnableOemUnlock, Utils.isOemUnlockEnabled(getActivity())); } - updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr, + updateSwitchPreference(mAllowMockLocation, Settings.Secure.getInt(cr, Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0); - updateCheckBox(mDebugViewAttributes, Settings.Global.getInt(cr, + updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr, Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0); updateHdcpValues(); updatePasswordSummary(); @@ -548,8 +547,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void resetDangerousOptions() { mDontPokeProperties = true; - for (int i=0; i<mResetCbPrefs.size(); i++) { - CheckBoxPreference cb = mResetCbPrefs.get(i); + for (int i=0; i< mResetSwitchPrefs.size(); i++) { + SwitchPreference cb = mResetSwitchPrefs.get(i); if (cb.isChecked()) { cb.setChecked(false); onPreferenceTreeClick(null, cb); @@ -630,7 +629,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateDebuggerOptions() { mDebugApp = Settings.Global.getString( getActivity().getContentResolver(), Settings.Global.DEBUG_APP); - updateCheckBox(mWaitForDebugger, Settings.Global.getInt( + updateSwitchPreference(mWaitForDebugger, Settings.Global.getInt( getActivity().getContentResolver(), Settings.Global.WAIT_FOR_DEBUGGER, 0) != 0); if (mDebugApp != null && mDebugApp.length() > 0) { String label; @@ -652,7 +651,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateVerifyAppsOverUsbOptions() { - updateCheckBox(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mVerifyAppsOverUsb, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0); mVerifyAppsOverUsb.setEnabled(enableVerifierSetting()); } @@ -732,7 +731,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateStrictModeVisualOptions() { - updateCheckBox(mStrictMode, currentStrictModeActiveIndex() == 1); + updateSwitchPreference(mStrictMode, currentStrictModeActiveIndex() == 1); } private void writePointerLocationOptions() { @@ -741,7 +740,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updatePointerLocationOptions() { - updateCheckBox(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(), Settings.System.POINTER_LOCATION, 0) != 0); } @@ -751,7 +750,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowTouchesOptions() { - updateCheckBox(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(), Settings.System.SHOW_TOUCHES, 0) != 0); } @@ -769,11 +768,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment @SuppressWarnings("unused") int enableGL = reply.readInt(); int showUpdates = reply.readInt(); - updateCheckBox(mShowScreenUpdates, showUpdates != 0); + updateSwitchPreference(mShowScreenUpdates, showUpdates != 0); @SuppressWarnings("unused") int showBackground = reply.readInt(); int disableOverlays = reply.readInt(); - updateCheckBox(mDisableOverlays, disableOverlays != 0); + updateSwitchPreference(mDisableOverlays, disableOverlays != 0); reply.recycle(); data.recycle(); } @@ -816,7 +815,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateHardwareUiOptions() { - updateCheckBox(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false)); + updateSwitchPreference(mForceHardwareUi, SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false)); } private void writeHardwareUiOptions() { @@ -825,7 +824,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateMsaaOptions() { - updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false)); + updateSwitchPreference(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false)); } private void writeMsaaOptions() { @@ -885,7 +884,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowHwScreenUpdatesOptions() { - updateCheckBox(mShowHwScreenUpdates, + updateSwitchPreference(mShowHwScreenUpdates, SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false)); } @@ -896,7 +895,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowHwLayersUpdatesOptions() { - updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean( + updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean( HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false)); } @@ -932,7 +931,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateDebugLayoutOptions() { - updateCheckBox(mDebugLayout, + updateSwitchPreference(mDebugLayout, SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false)); } @@ -998,7 +997,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateUseNuplayerOptions() { - updateCheckBox( + updateSwitchPreference( mUseNuplayer, !SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false)); } @@ -1009,7 +1008,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateUSBAudioOptions() { - updateCheckBox(mUSBAudio, Settings.Secure.getInt(getContentResolver(), + updateSwitchPreference(mUSBAudio, Settings.Secure.getInt(getContentResolver(), Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, 0) != 0); } @@ -1020,7 +1019,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateForceRtlOptions() { - updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0); } @@ -1033,7 +1032,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateWifiDisplayCertificationOptions() { - updateCheckBox(mWifiDisplayCertification, Settings.Global.getInt( + updateSwitchPreference(mWifiDisplayCertification, Settings.Global.getInt( getActivity().getContentResolver(), Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, 0) != 0); } @@ -1046,7 +1045,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiVerboseLoggingOptions() { boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0; - updateCheckBox(mWifiVerboseLogging, enabled); + updateSwitchPreference(mWifiVerboseLogging, enabled); } private void writeWifiVerboseLoggingOptions() { @@ -1055,7 +1054,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiAggressiveHandoverOptions() { boolean enabled = mWifiManager.getAggressiveHandover() > 0; - updateCheckBox(mWifiAggressiveHandover, enabled); + updateSwitchPreference(mWifiAggressiveHandover, enabled); } private void writeWifiAggressiveHandoverOptions() { @@ -1064,7 +1063,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void updateWifiAllowScansWithTrafficOptions() { boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0; - updateCheckBox(mWifiAllowScansWithTraffic, enabled); + updateSwitchPreference(mWifiAllowScansWithTraffic, enabled); } private void writeWifiAllowScansWithTrafficOptions() { @@ -1121,7 +1120,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateCpuUsageOptions() { - updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(), + updateSwitchPreference(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(), Settings.Global.SHOW_PROCESSES, 0) != 0); } @@ -1147,8 +1146,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateImmediatelyDestroyActivitiesOptions() { - updateCheckBox(mImmediatelyDestroyActivities, Settings.Global.getInt( - getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0); + updateSwitchPreference(mImmediatelyDestroyActivities, Settings.Global.getInt( + getActivity().getContentResolver(), Settings.Global.ALWAYS_FINISH_ACTIVITIES, 0) != 0); } private void updateAnimationScaleValue(int which, ListPreference pref) { @@ -1273,8 +1272,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment } private void updateShowAllANRsOptions() { - updateCheckBox(mShowAllANRs, Settings.Secure.getInt( - getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0); + updateSwitchPreference(mShowAllANRs, Settings.Secure.getInt( + getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0); } @Override |