Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

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"/>