diff options
author | Heemin Seog <hseog@google.com> | 2019-04-17 09:12:45 -0700 |
---|---|---|
committer | Heemin Seog <hseog@google.com> | 2019-05-02 15:34:19 -0700 |
commit | 91d9ba6744b447bdf95273b4afbec1017ddbd165 (patch) | |
tree | 5fd6f779189afd09d1718ad2df69eb04043b4377 /res/values | |
parent | 0d3ea56d8f195852ed59659393df85ef1002d0d6 (diff) | |
download | android_packages_apps_PackageInstaller-91d9ba6744b447bdf95273b4afbec1017ddbd165.tar.gz android_packages_apps_PackageInstaller-91d9ba6744b447bdf95273b4afbec1017ddbd165.tar.bz2 android_packages_apps_PackageInstaller-91d9ba6744b447bdf95273b4afbec1017ddbd165.zip |
Theme roles to look like Car Settings
Requires some changes to existing code to special case with
DeviceUtils.isAuto(). At the activity level, this is consistent with how
the permissions screens are set up.
Bug: 130348508
Test: manual
Change-Id: I323ed0cd2fdf8f7c7c5fd279b13ddb76f8de2697
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 5 | ||||
-rw-r--r-- | res/values/styles.xml | 17 | ||||
-rw-r--r-- | res/values/themes.xml | 16 |
4 files changed, 42 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index e220f4c8..f8144d74 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -32,4 +32,8 @@ <attr name="circle_radius_pressed_percent" format="fraction" /> </declare-styleable> <!-- END: Ported from WearableSupport --> + + <!-- START: Car Settings Preferences --> + <attr name="carDividerColor" format="color"/> + <!-- END: Car Settings Preferences --> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index bac131a6..04ec00ce 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -54,4 +54,9 @@ <dimen name="incident_image_width">150dp</dimen> <dimen name="incident_image_height">200dp</dimen> + <!-- Auto related dimensions --> + <dimen name="car_action_bar_height">@*android:dimen/car_app_bar_height</dimen> + <dimen name="car_margin">@*android:dimen/car_margin</dimen> + <dimen name="car_icon_size">@*android:dimen/car_primary_icon_size</dimen> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 9da063d7..b8fbc380 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -858,4 +858,21 @@ <!-- END ACCESSIBILITY SERVICE DIALOG ITEM --> + <!-- START CAR SETTINGS PREFERENCE STYLES --> + + <style name="CarPreferenceFragment"> + <item name="android:layout">@layout/car_default_app_frame</item> + </style> + + <style name="CarPreferenceFragmentList"> + <item name="android:paddingTop">0dp</item> + <item name="android:paddingBottom">0dp</item> + <item name="android:paddingStart">0dp</item> + <item name="android:paddingEnd">0dp</item> + <item name="android:paddingLeft">0dp</item> + <item name="android:paddingRight">0dp</item> + </style> + + <!-- END CAR SETTINGS PREFERENCE STYLES --> + </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index 4dd6e326..848cd78a 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -22,6 +22,12 @@ <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item> </style> + + <style name="Settings.NoActionBar" parent="Settings"> + <item name="android:windowActionBar">false</item> + <item name="android:windowNoTitle">true</item> + </style> + <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.DeviceDefault.Medium"> <item name="android:textAllCaps">true</item> @@ -78,4 +84,14 @@ parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> </style> + <style name="CarSettings" parent="Settings.NoActionBar"> + <item name="preferenceTheme">@style/CarPreferenceTheme</item> + <item name="carDividerColor">@*android:color/car_list_divider</item> + </style> + + <style name="CarPreferenceTheme"> + <item name="preferenceFragmentCompatStyle">@style/CarPreferenceFragment</item> + <item name="preferenceFragmentListStyle">@style/CarPreferenceFragmentList</item> + </style> + </resources> |