PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-22 05:05:21 +00:00
committed by Android (Google) Code Review
parent bad38a1940 a08e2720c6
commit 721c58deb4
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/ambient_display_settings.xml
View File

@@ -44,7 +44,8 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="ambient_display_category_notification"> android:key="ambient_display_category_notification"
android:layout="@layout/preference_category_no_label">
<SwitchPreference <SwitchPreference
android:key="ambient_display_notification" android:key="ambient_display_notification"

4
res/xml/app_data_usage.xml
View File

@@ -47,7 +47,9 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="app_data_usage_settings_category"> android:key="app_data_usage_settings_category"
android:layout="@layout/preference_category_no_label">
<Preference <Preference
android:key="app_settings" android:key="app_settings"
android:title="@string/data_usage_app_settings" /> android:title="@string/data_usage_app_settings" />

9
res/xml/date_time_prefs.xml
View File

@@ -22,7 +22,8 @@
settings:keywords="@string/keywords_date_and_time"> settings:keywords="@string/keywords_date_and_time">
<PreferenceCategory <PreferenceCategory
android:key="date_time_preference_category"> android:key="date_time_preference_category"
android:layout="@layout/preference_category_no_label">
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_time" android:key="auto_time"
android:title="@string/date_time_auto" android:title="@string/date_time_auto"
@@ -46,7 +47,8 @@
</PreferenceCategory> </PreferenceCategory>
<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 <com.android.settingslib.RestrictedSwitchPreference
android:key="auto_zone" android:key="auto_zone"
android:title="@string/zone_auto" android:title="@string/zone_auto"
@@ -63,7 +65,8 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="time_format_preference_category"> android:key="time_format_preference_category"
android:layout="@layout/preference_category_no_label">
<SwitchPreference <SwitchPreference
android:key="auto_24hour" android:key="auto_24hour"
android:title="@string/date_time_24hour_auto" android:title="@string/date_time_24hour_auto"

3
res/xml/language_and_input.xml
View File

@@ -67,7 +67,8 @@
</PreferenceCategory> </PreferenceCategory>
<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 <com.android.settings.PointerSpeedPreference
android:key="pointer_speed" android:key="pointer_speed"

12
res/xml/wifi_settings.xml
View File

@@ -20,11 +20,17 @@
android:title="@string/wifi_settings" android:title="@string/wifi_settings"
settings:keywords="@string/keywords_wifi"> 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 <Preference
android:key="configure_settings" android:key="configure_settings"
android:title="@string/wifi_configure_settings_preference_title" android:title="@string/wifi_configure_settings_preference_title"