Merge "Add Toggle Controllers to XML"
This commit is contained in:
committed by
Android (Google) Code Review
commit
f94f6d41d9
@@ -16,6 +16,7 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:title="@string/battery_saver"
|
||||
android:key="battery_saver">
|
||||
|
||||
@@ -23,12 +24,15 @@
|
||||
<SwitchPreference
|
||||
android:key="auto_battery_saver"
|
||||
android:title="@string/battery_saver_auto_title"
|
||||
android:summary="@string/battery_saver_auto_summary"/>
|
||||
android:summary="@string/battery_saver_auto_summary"
|
||||
settings:controller="com.android.settings.fuelgauge.batterysaver.AutoBatterySaverPreferenceController"/>
|
||||
|
||||
<com.android.settings.widget.SeekBarPreference
|
||||
android:key="battery_saver_seek_bar"
|
||||
android:title="@string/battery_saver_seekbar_title"
|
||||
android:max="75"
|
||||
android:min="5"/>
|
||||
|
||||
<com.android.settings.applications.LayoutPreference
|
||||
android:key="battery_saver_button_container"
|
||||
android:selectable="false"
|
||||
|
@@ -25,8 +25,8 @@
|
||||
android:title="@string/bluetooth_settings_title"
|
||||
android:icon="@drawable/ic_settings_bluetooth"
|
||||
android:summary="@string/bluetooth_pref_summary"
|
||||
settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
|
||||
android:order="-7"/>
|
||||
android:order="-7"
|
||||
settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_nfc"
|
||||
@@ -54,6 +54,7 @@
|
||||
android:title="@string/bluetooth_on_while_driving_pref"
|
||||
android:icon="@drawable/ic_settings_bluetooth"
|
||||
android:summary="@string/bluetooth_on_while_driving_summary"
|
||||
settings:controller="com.android.settings.connecteddevice.BluetoothOnWhileDrivingPreferenceController"
|
||||
android:order="-2"/>
|
||||
|
||||
<Preference
|
||||
|
@@ -43,8 +43,9 @@
|
||||
<com.android.settingslib.RestrictedSwitchPreference
|
||||
android:key="auto_brightness"
|
||||
android:title="@string/auto_brightness_title"
|
||||
settings:keywords="@string/keywords_display_auto_brightness"
|
||||
android:summary="@string/auto_brightness_summary"
|
||||
settings:keywords="@string/keywords_display_auto_brightness"
|
||||
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"
|
||||
settings:useAdminDisabledSummary="true"
|
||||
settings:userRestriction="no_config_brightness" />
|
||||
|
||||
|
@@ -79,7 +79,8 @@
|
||||
<SwitchPreference
|
||||
android:key="visiblepattern_profile"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile" />
|
||||
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
|
||||
settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:key="fingerprint_settings_profile"
|
||||
@@ -103,7 +104,8 @@
|
||||
<SwitchPreference
|
||||
android:key="show_password"
|
||||
android:title="@string/show_password"
|
||||
android:summary="@string/show_password_summary" />
|
||||
android:summary="@string/show_password_summary"
|
||||
settings:controller="com.android.settings.security.ShowPasswordPreferenceController"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
@@ -16,6 +16,7 @@
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="security_lockscreen_settings_screen"
|
||||
android:title="@string/lockscreen_settings_title">
|
||||
|
||||
@@ -36,7 +37,8 @@
|
||||
<SwitchPreference
|
||||
android:key="security_setting_lockdown_enabled"
|
||||
android:title="@string/lockdown_settings_title"
|
||||
android:summary="@string/lockdown_settings_summary" />
|
||||
android:summary="@string/lockdown_settings_summary"
|
||||
settings:controller="com.android.settings.security.LockdownButtonPreferenceController"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="security_setting_lock_screen_notif_work_header"
|
||||
|
Reference in New Issue
Block a user