Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
index 8bd9bd6..306ead5 100644
--- a/res/xml/ambient_display_settings.xml
+++ b/res/xml/ambient_display_settings.xml
@@ -44,7 +44,8 @@
</PreferenceCategory>
<PreferenceCategory
- android:key="ambient_display_category_notification">
+ android:key="ambient_display_category_notification"
+ android:layout="@layout/preference_category_no_label">
<SwitchPreference
android:key="ambient_display_notification"
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index a4b2159..5eaee96 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -47,7 +47,9 @@
</PreferenceCategory>
<PreferenceCategory
- android:key="app_data_usage_settings_category">
+ android:key="app_data_usage_settings_category"
+ android:layout="@layout/preference_category_no_label">
+
<Preference
android:key="app_settings"
android:title="@string/data_usage_app_settings" />
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index bc11908..3249189 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -22,7 +22,8 @@
settings:keywords="@string/keywords_date_and_time">
<PreferenceCategory
- android:key="date_time_preference_category">
+ android:key="date_time_preference_category"
+ android:layout="@layout/preference_category_no_label">
<com.android.settingslib.RestrictedSwitchPreference
android:key="auto_time"
android:title="@string/date_time_auto"
@@ -46,7 +47,8 @@
</PreferenceCategory>
<PreferenceCategory
- android:key="time_zone_preference_category">
+ android:key="time_zone_preference_category"
+ android:layout="@layout/preference_category_no_label">
<com.android.settingslib.RestrictedSwitchPreference
android:key="auto_zone"
android:title="@string/zone_auto"
@@ -63,7 +65,8 @@
</PreferenceCategory>
<PreferenceCategory
- android:key="time_format_preference_category">
+ android:key="time_format_preference_category"
+ android:layout="@layout/preference_category_no_label">
<SwitchPreference
android:key="auto_24hour"
android:title="@string/date_time_24hour_auto"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index d5bb29c..d7fad7e 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -67,7 +67,8 @@
</PreferenceCategory>
<PreferenceCategory
- android:key="pointer_and_tts_category">
+ android:key="pointer_and_tts_category"
+ android:layout="@layout/preference_category_no_label">
<com.android.settings.PointerSpeedPreference
android:key="pointer_speed"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index e391bcd..52aadcf 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -20,11 +20,17 @@
android:title="@string/wifi_settings"
settings:keywords="@string/keywords_wifi">
- <PreferenceCategory android:key="connected_access_point" />
+ <PreferenceCategory
+ android:key="connected_access_point"
+ android:layout="@layout/preference_category_no_label"/>
- <PreferenceCategory android:key="access_points"/>
+ <PreferenceCategory
+ android:key="access_points"
+ android:layout="@layout/preference_category_no_label"/>
- <PreferenceCategory android:key="additional_settings">
+ <PreferenceCategory
+ android:key="additional_settings"
+ android:layout="@layout/preference_category_no_label">
<Preference
android:key="configure_settings"
android:title="@string/wifi_configure_settings_preference_title"