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

Merge "Tweak spacing for horizontal preferences." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-05-02 17:03:12 +00:00
committed by Android (Google) Code Review
parent 23550fdcd3 0e4c59f7f6
commit b4937f4556
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/horizontal_preference.xml
View File

@@ -16,11 +16,12 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="1dp"
android:paddingStart="@dimen/preference_no_icon_padding_start" android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

65
res/xml/app_data_usage.xml
View File

@@ -15,48 +15,51 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/data_usage_summary_title"> android:title="@string/data_usage_summary_title">
<com.android.settings.datausage.SpinnerPreference <com.android.settings.datausage.SpinnerPreference
android:key="cycle" /> android:key="cycle" />
<com.android.settings.applications.SpacePreference <PreferenceCategory
android:layout_height="8dp" /> android:key="app_data_usage_summary_category">
<Preference <Preference
android:key="total_usage" android:key="total_usage"
android:title="@string/total_size_label" android:title="@string/total_size_label"
android:selectable="false" android:selectable="false"
android:layout="@layout/horizontal_preference" /> android:layout="@layout/horizontal_preference" />
<Preference <Preference
android:key="foreground_usage" android:key="foreground_usage"
android:title="@string/data_usage_label_foreground" android:title="@string/data_usage_label_foreground"
android:selectable="false" android:selectable="false"
android:layout="@layout/horizontal_preference" /> android:layout="@layout/horizontal_preference" />
<Preference <Preference
android:key="background_usage" android:key="background_usage"
android:title="@string/data_usage_label_background" android:title="@string/data_usage_label_background"
android:selectable="false" android:selectable="false"
android:layout="@layout/horizontal_preference" /> android:layout="@layout/horizontal_preference" />
<com.android.settings.applications.SpacePreference </PreferenceCategory>
android:layout_height="8dp" />
<Preference <PreferenceCategory
android:key="app_settings" android:key="app_data_usage_settings_category">
android:title="@string/data_usage_app_settings" /> <Preference
android:key="app_settings"
android:title="@string/data_usage_app_settings" />
<SwitchPreference <SwitchPreference
android:key="restrict_background" android:key="restrict_background"
android:title="@string/data_usage_app_restrict_background" android:title="@string/data_usage_app_restrict_background"
android:summary="@string/data_usage_app_restrict_background_summary" /> android:summary="@string/data_usage_app_restrict_background_summary" />
<SwitchPreference <SwitchPreference
android:key="unrestricted_data_saver" android:key="unrestricted_data_saver"
android:title="@string/unrestricted_app_title" android:title="@string/unrestricted_app_title"
android:summary="@string/unrestricted_app_summary" /> android:summary="@string/unrestricted_app_summary" />
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="app_list" android:key="app_list"