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

* commit '667695eb117c8d1865b12145c5a348e8da5f70e1':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
This commit is contained in:
Fabrice Di Meglio
2014-10-16 21:45:10 +00:00
committed by Android Git Automerger
14 changed files with 43 additions and 61 deletions

View File

@@ -128,7 +128,7 @@
android:entries="@array/apn_protocol_entries"
android:entryValues="@array/apn_protocol_values"
/>
<CheckBoxPreference
<SwitchPreference
android:title="@string/carrier_enabled"
android:key="carrier_enabled"
android:enabled="false"

View File

@@ -97,7 +97,7 @@
android:key="game_controller_settings_category"
android:title="@string/game_controller_settings_category">
<CheckBoxPreference
<SwitchPreference
android:key="vibrate_input_devices"
android:title="@string/vibrate_input_devices"
android:summaryOn="@string/vibrate_input_devices_summary"

View File

@@ -77,7 +77,7 @@
android:targetClass="com.android.settings.wimax.WimaxSettings" />
</PreferenceScreen>
<CheckBoxPreference
<SwitchPreference
android:key="toggle_nsd"
android:title="@string/nsd_quick_toggle_title"
android:summary="@string/nsd_quick_toggle_summary"