Revert "Align more prefs for icon space."
Bug: 33798492
This reverts commit ded9fc9b0726bae0e7500fa98e6876b6d003d279.
Change-Id: I9831858ffda263496617dff29249e243c007fa12
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 0f9f82b..c17da05 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -92,7 +92,7 @@
<PreferenceCategory
android:title="@string/advanced_apps">
- <Preference
+ <PreferenceScreen
android:key="special_access"
android:fragment="com.android.settings.applications.SpecialAccessSettings"
android:title="@string/special_access" />
diff --git a/res/xml/application_settings.xml b/res/xml/application_settings.xml
index 9987fc2..1afe243 100644
--- a/res/xml/application_settings.xml
+++ b/res/xml/application_settings.xml
@@ -26,26 +26,26 @@
android:summary="@string/applications_settings_summary"
android:key="applications_settings">
- <Preference
+ <PreferenceScreen
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/manageapplications_settings_title"
android:summary="@string/manageapplications_settings_summary">
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/runningservices_settings_title"
android:summary="@string/runningservices_settings_summary">
<extra android:name="classname" android:value="com.android.settings.Settings$RunningServicesActivity" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:fragment="com.android.settings.applications.ManageApplications"
android:title="@string/storageuse_settings_title"
android:summary="@string/storageuse_settings_summary">
<extra android:name="classname"
android:value="com.android.settings.Settings$StorageUseActivity" />
- </Preference>
+ </PreferenceScreen>
<CheckBoxPreference
android:key="toggle_advanced_settings"
diff --git a/res/xml/automatic_storage_management_settings.xml b/res/xml/automatic_storage_management_settings.xml
index af79396..c597cc8 100644
--- a/res/xml/automatic_storage_management_settings.xml
+++ b/res/xml/automatic_storage_management_settings.xml
@@ -32,10 +32,12 @@
android:title="@string/downloads_backup_preference_title"
android:summary="@string/downloads_backup_text"/>
- <Preference
+ <com.android.settings.fuelgauge.WallOfTextPreference
android:key="freed_bytes"
android:persistent="false"
- android:selectable="false" />
+ android:selectable="false"
+ settings:allowDividerAbove="false"
+ settings:allowDividerBelow="true" />
<DropDownPreference
android:key="days"
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 1720c73..630016f 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -15,6 +15,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">
@@ -24,4 +25,12 @@
android:title="@string/battery_saver_turn_on_automatically_title"
android:summary="%s" />
+ <!-- Feature description text -->
+ <com.android.settings.fuelgauge.WallOfTextPreference
+ android:key="description"
+ android:summary="@*android:string/battery_saver_description"
+ android:persistent="false"
+ android:selectable="false"
+ settings:allowDividerAbove="true" />
+
</PreferenceScreen>
diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 0244030..20ce5c8 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -15,6 +15,7 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/data_saver_title">
<Preference
@@ -22,4 +23,12 @@
android:title="@string/unrestricted_data_saver"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
+ <!-- Feature description text -->
+ <com.android.settings.fuelgauge.WallOfTextPreference
+ android:key="description"
+ android:summary="@*android:string/data_saver_description"
+ android:persistent="false"
+ android:selectable="false"
+ settings:allowDividerAbove="true" />
+
</PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 2632c78..1440c3f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,12 +19,12 @@
android:title="@string/display_settings"
settings:keywords="@string/keywords_display">
- <Preference
+ <PreferenceScreen
android:key="brightness"
android:title="@string/brightness"
settings:keywords="@string/keywords_display_brightness_level">
<intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
- </Preference>
+ </PreferenceScreen>
<SwitchPreference
android:key="auto_brightness"
@@ -70,7 +70,7 @@
android:title="@string/camera_gesture_title"
android:summary="@string/camera_gesture_desc" />
- <Preference
+ <PreferenceScreen
android:key="screensaver"
android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.DreamSettings" />
@@ -89,7 +89,7 @@
android:title="@string/tap_to_wake"
android:summary="@string/tap_to_wake_summary" />
- <Preference
+ <PreferenceScreen
android:key="font_size"
android:title="@string/title_font_size"
android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
@@ -105,7 +105,7 @@
android:summary="%s"
android:title="@string/display_auto_rotate_title" />
- <Preference
+ <PreferenceScreen
android:key="wifi_display"
android:title="@string/wifi_display_settings_title"
settings:keywords="@string/keywords_display_cast_screen"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 8aa105b..992af92 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -18,7 +18,7 @@
android:key="language_keyboard_settings"
android:title="@string/language_keyboard_settings_title">
- <Preference
+ <PreferenceScreen
android:key="phone_language"
android:title="@string/phone_language"
android:fragment="com.android.settings.localepicker.LocaleListEditor"
@@ -34,17 +34,17 @@
android:persistent="false"/>
<!-- User dictionary preference title and fragment will be set programmatically. -->
- <Preference
+ <PreferenceScreen
android:key="key_user_dictionary_settings"
android:title="@string/user_dict_settings_title"
/>
<PreferenceCategory
android:title="@string/keyboard_and_input_methods_category">
- <Preference
+ <PreferenceScreen
android:title="@string/virtual_keyboard_category"
android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
- <Preference
+ <PreferenceScreen
android:title="@string/physical_keyboard_title"
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
</PreferenceCategory>
@@ -53,7 +53,7 @@
android:key="voice_category"
android:title="@string/voice_category" >
- <Preference
+ <PreferenceScreen
android:key="tts_settings"
android:title="@string/tts_settings_title"
android:fragment="com.android.settings.tts.TextToSpeechSettings"
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index c0b91ae..76b9323 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -46,4 +46,9 @@
</PreferenceCategory>
+ <com.android.settings.fuelgauge.WallOfTextPreference
+ android:summary="@string/night_display_text"
+ android:selectable="false"
+ settings:allowDividerAbove="true" />
+
</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index eeef64c..f2af8f3 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -19,24 +19,24 @@
android:title="@string/privacy_settings_title">
<!-- Backup settings -->
- <Preference
+ <PreferenceScreen
android:key="backup_data"
android:title="@string/backup_data_title"
android:persistent="false"
android:fragment="com.android.settings.backup.ToggleBackupSettingFragment"/>
- <Preference
+ <PreferenceScreen
android:key="configure_account"
android:title="@string/backup_configure_account_title"
android:persistent="false">
<!-- the Intent declared here is always overwritten by a real one -->
<intent android:action="dummy" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:key="data_management"
android:persistent="false">
- </Preference>
+ </PreferenceScreen>
<SwitchPreference
android:key="auto_restore"
diff --git a/res/xml/security_settings_unencrypted.xml b/res/xml/security_settings_unencrypted.xml
index 7c51d25..ee87705 100644
--- a/res/xml/security_settings_unencrypted.xml
+++ b/res/xml/security_settings_unencrypted.xml
@@ -21,7 +21,7 @@
android:key="security_category"
android:title="@string/crypt_keeper_settings_title">
- <Preference
+ <PreferenceScreen
android:key="encryption"
android:title="@string/crypt_keeper_encrypt_title"
android:fragment="com.android.settings.CryptKeeperSettings" />
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 4de167a..31789fb 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -18,7 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <Preference
+ <PreferenceScreen
android:key="high_power_apps"
android:title="@string/high_power_apps"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -26,19 +26,19 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:key="device_administrators"
android:title="@string/manage_device_admin"
android:fragment="com.android.settings.DeviceAdminSettings" />
- <Preference
+ <PreferenceScreen
android:key="zen_access"
android:title="@string/manage_zen_access_title"
android:fragment="com.android.settings.notification.ZenAccessSettings" />
- <Preference
+ <PreferenceScreen
android:key="system_alert_window"
android:title="@string/system_alert_window_settings"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -46,9 +46,9 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$OverlaySettingsActivity" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:key="enabled_vr_listeners"
android:title="@string/vr_listeners_title"
android:fragment="com.android.settings.applications.VrListenerSettings"
@@ -56,9 +56,9 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:key="write_settings_apps"
android:title="@string/write_settings"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -66,24 +66,24 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$WriteSettingsActivity" />
- </Preference>
+ </PreferenceScreen>
- <Preference
+ <PreferenceScreen
android:key="notification_access"
android:title="@string/manage_notification_access_title"
android:fragment="com.android.settings.notification.NotificationAccessSettings" />
- <Preference
+ <PreferenceScreen
android:key="premium_sms"
android:title="@string/premium_sms_access"
android:fragment="com.android.settings.applications.PremiumSmsAccess" />
- <Preference
+ <PreferenceScreen
android:key="data_saver"
android:title="@string/unrestricted_data_saver"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
- <Preference
+ <PreferenceScreen
android:key="usage_access"
android:title="@string/usage_access"
android:fragment="com.android.settings.applications.ManageApplications"
@@ -91,5 +91,5 @@
<extra
android:name="classname"
android:value="com.android.settings.Settings$UsageAccessSettingsActivity" />
- </Preference>
+ </PreferenceScreen>
</PreferenceScreen>
diff --git a/res/xml/virtual_keyboard_settings.xml b/res/xml/virtual_keyboard_settings.xml
index d5f0496..e5a5f38 100644
--- a/res/xml/virtual_keyboard_settings.xml
+++ b/res/xml/virtual_keyboard_settings.xml
@@ -16,7 +16,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/virtual_keyboard_category">
<!-- Enabled input method list will be populated programmatically here. -->
- <Preference
+ <PreferenceScreen
android:key="add_virtual_keyboard_screen"
android:title="@string/add_virtual_keyboard"
android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index b22ad6a..d8ad10d 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -20,19 +20,19 @@
android:title="@string/zen_mode_settings_title" >
<!-- Priority only allows -->
- <Preference
+ <PreferenceScreen
android:key="priority_settings"
android:title="@string/zen_mode_priority_settings_title"
android:fragment="com.android.settings.notification.ZenModePrioritySettings" />
<!-- Automated rules -->
- <Preference
+ <PreferenceScreen
android:key="automation_settings"
android:title="@string/zen_mode_automation_settings_title"
android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
<!-- Visual interruptions -->
- <Preference
+ <PreferenceScreen
android:key="visual_interruptions_settings"
android:title="@string/zen_mode_visual_interruptions_settings_title"
android:fragment="com.android.settings.notification.ZenModeVisualInterruptionSettings" />