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
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 128aa5f..2fb3033 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -32,7 +32,7 @@
android:targetClass="com.android.settings.SetFullBackupPassword" />
</PreferenceScreen>
- <CheckBoxPreference
+ <SwitchPreference
android:key="keep_screen_on"
android:title="@string/keep_screen_on"
android:summary="@string/keep_screen_on_summary"/>
@@ -44,12 +44,12 @@
android:entries="@array/hdcp_checking_titles"
android:entryValues="@array/hdcp_checking_values" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="bt_hci_snoop_log"
android:title="@string/bt_hci_snoop_log"
android:summary="@string/bt_hci_snoop_log_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="oem_unlock_enable"
android:title="@string/oem_unlock_enable"
android:summary="@string/oem_unlock_enable_summary"/>
@@ -63,7 +63,7 @@
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="enable_adb"
android:title="@string/enable_adb"
android:summary="@string/enable_adb_summary"/>
@@ -71,54 +71,54 @@
<Preference android:key="clear_adb_keys"
android:title="@string/clear_adb_keys" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="enable_terminal"
android:title="@string/enable_terminal_title"
android:summary="@string/enable_terminal_summary" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="bugreport_in_power"
android:title="@string/bugreport_in_power"
android:summary="@string/bugreport_in_power_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="allow_mock_location"
android:title="@string/allow_mock_location"
android:summary="@string/allow_mock_location_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="debug_view_attributes"
android:title="@string/debug_view_attributes" />
<PreferenceScreen android:key="debug_app"
android:title="@string/debug_app" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="wait_for_debugger"
android:title="@string/wait_for_debugger"
android:summary="@string/wait_for_debugger_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="verify_apps_over_usb"
android:title="@string/verify_apps_over_usb_title"
android:summary="@string/verify_apps_over_usb_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="wifi_display_certification"
android:title="@string/wifi_display_certification"
android:summary="@string/wifi_display_certification_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging" />
android:summary="@string/wifi_verbose_logging_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="wifi_aggressive_handover"
android:title="@string/wifi_aggressive_handover" />
android:summary="@string/wifi_aggressive_handover_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="wifi_allow_scan_with_traffic"
android:title="@string/wifi_allow_scan_with_traffic" />
android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
@@ -135,12 +135,12 @@
<PreferenceCategory android:key="debug_input_category"
android:title="@string/debug_input_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_touches"
android:title="@string/show_touches"
android:summary="@string/show_touches_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="pointer_location"
android:title="@string/pointer_location"
android:summary="@string/pointer_location_summary"/>
@@ -150,17 +150,17 @@
<PreferenceCategory android:key="debug_drawing_category"
android:title="@string/debug_drawing_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
android:summary="@string/show_screen_updates_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="debug_layout"
android:title="@string/debug_layout"
android:summary="@string/debug_layout_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="force_rtl_layout_all_locales"
android:title="@string/force_rtl_layout_all_locales"
android:summary="@string/force_rtl_layout_all_locales_summary"/>
@@ -198,17 +198,17 @@
<PreferenceCategory android:key="debug_hw_drawing_category"
android:title="@string/debug_hw_drawing_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="force_hw_ui"
android:title="@string/force_hw_ui"
android:summary="@string/force_hw_ui_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_hw_screen_udpates"
android:title="@string/show_hw_screen_updates"
android:summary="@string/show_hw_screen_updates_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_hw_layers_udpates"
android:title="@string/show_hw_layers_updates"
android:summary="@string/show_hw_layers_updates_summary"/>
@@ -227,12 +227,12 @@
android:entries="@array/show_non_rect_clip_entries"
android:entryValues="@array/show_non_rect_clip_values" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="force_msaa"
android:title="@string/force_msaa"
android:summary="@string/force_msaa_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="disable_overlays"
android:title="@string/disable_overlays"
android:summary="@string/disable_overlays_summary"/>
@@ -250,12 +250,12 @@
<PreferenceCategory android:key="media_category"
android:title="@string/media_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="use_nuplayer"
android:title="@string/use_nuplayer"
android:summary="@string/use_nuplayer_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="usb_audio"
android:title="@string/usb_audio_disable_routing"
android:summary="@string/usb_audio_disable_routing_summary" />
@@ -265,12 +265,12 @@
<PreferenceCategory android:key="debug_monitoring_category"
android:title="@string/debug_monitoring_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="strict_mode"
android:title="@string/strict_mode"
android:summary="@string/strict_mode_summary"/>
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_cpu_usage"
android:title="@string/show_cpu_usage"
android:summary="@string/show_cpu_usage_summary"/>
@@ -294,7 +294,7 @@
<PreferenceCategory android:key="debug_applications_category"
android:title="@string/debug_applications_category">
- <CheckBoxPreference
+ <SwitchPreference
android:key="immediately_destroy_activities"
android:title="@string/immediately_destroy_activities"
android:summary="@string/immediately_destroy_activities_summary"/>
@@ -306,7 +306,7 @@
android:entries="@array/app_process_limit_entries"
android:entryValues="@array/app_process_limit_values" />
- <CheckBoxPreference
+ <SwitchPreference
android:key="show_all_anrs"
android:title="@string/show_all_anrs"
android:summary="@string/show_all_anrs_summary"/>
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.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 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 @@
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 SwitchPreference mWaitForDebugger;
+ private SwitchPreference mVerifyAppsOverUsb;
+ private SwitchPreference mWifiDisplayCertification;
+ private SwitchPreference mWifiVerboseLogging;
+ private SwitchPreference 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 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 @@
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 @@
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 @@
}
}
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 @@
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 @@
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 @@
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 @@
}
}
- 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 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
}
private void updateStrictModeVisualOptions() {
- updateCheckBox(mStrictMode, currentStrictModeActiveIndex() == 1);
+ updateSwitchPreference(mStrictMode, currentStrictModeActiveIndex() == 1);
}
private void writePointerLocationOptions() {
@@ -741,7 +740,7 @@
}
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 @@
}
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 @@
@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 @@
}
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 @@
}
private void updateMsaaOptions() {
- updateCheckBox(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
+ updateSwitchPreference(mForceMsaa, SystemProperties.getBoolean(MSAA_PROPERTY, false));
}
private void writeMsaaOptions() {
@@ -885,7 +884,7 @@
}
private void updateShowHwScreenUpdatesOptions() {
- updateCheckBox(mShowHwScreenUpdates,
+ updateSwitchPreference(mShowHwScreenUpdates,
SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false));
}
@@ -896,7 +895,7 @@
}
private void updateShowHwLayersUpdatesOptions() {
- updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean(
+ updateSwitchPreference(mShowHwLayersUpdates, SystemProperties.getBoolean(
HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
}
@@ -932,7 +931,7 @@
}
private void updateDebugLayoutOptions() {
- updateCheckBox(mDebugLayout,
+ updateSwitchPreference(mDebugLayout,
SystemProperties.getBoolean(View.DEBUG_LAYOUT_PROPERTY, false));
}
@@ -998,7 +997,7 @@
}
private void updateUseNuplayerOptions() {
- updateCheckBox(
+ updateSwitchPreference(
mUseNuplayer, !SystemProperties.getBoolean(USE_AWESOMEPLAYER_PROPERTY, false));
}
@@ -1009,7 +1008,7 @@
}
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 @@
}
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 @@
}
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 @@
private void updateWifiVerboseLoggingOptions() {
boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;
- updateCheckBox(mWifiVerboseLogging, enabled);
+ updateSwitchPreference(mWifiVerboseLogging, enabled);
}
private void writeWifiVerboseLoggingOptions() {
@@ -1055,7 +1054,7 @@
private void updateWifiAggressiveHandoverOptions() {
boolean enabled = mWifiManager.getAggressiveHandover() > 0;
- updateCheckBox(mWifiAggressiveHandover, enabled);
+ updateSwitchPreference(mWifiAggressiveHandover, enabled);
}
private void writeWifiAggressiveHandoverOptions() {
@@ -1064,7 +1063,7 @@
private void updateWifiAllowScansWithTrafficOptions() {
boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
- updateCheckBox(mWifiAllowScansWithTraffic, enabled);
+ updateSwitchPreference(mWifiAllowScansWithTraffic, enabled);
}
private void writeWifiAllowScansWithTrafficOptions() {
@@ -1121,7 +1120,7 @@
}
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 @@
}
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 @@
}
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