diff options
| author | Joel Galenson <jgalenson@google.com> | 2019-04-03 11:26:26 -0700 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2019-04-03 11:26:26 -0700 |
| commit | 8bfc9d47eb54a7529f23472a9720487251b26f71 (patch) | |
| tree | ea9f94464dc27ec3b59fd59c0393e7f541ced7f6 /res/values | |
| parent | 1ec94cfd4b8844ae1cfbfbc7a95b1b450c9e52a6 (diff) | |
| download | android_packages_apps_PackageInstaller-8bfc9d47eb54a7529f23472a9720487251b26f71.tar.gz android_packages_apps_PackageInstaller-8bfc9d47eb54a7529f23472a9720487251b26f71.tar.bz2 android_packages_apps_PackageInstaller-8bfc9d47eb54a7529f23472a9720487251b26f71.zip | |
Fix PreferenceCategory style.
We were using a PreferenceCategory defined in PermissionController,
which overrode the global one. By removing it, we can apply themes to
it to look more like Settings.
Fixes: 128439459
Test: View permission screens.
Change-Id: I8dfb518f6dc3cc6e77cc64005f0a6a0786b08168
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/styles.xml | 8 | ||||
| -rw-r--r-- | res/values/themes.xml | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 9365ddcc..335a6cb8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -269,13 +269,13 @@ <item name="android:background">?android:attr/selectableItemBackground</item> </style> - <style name="AppPermissionMessage"> + <style name="AppPermissionMessage" + parent="@style/TextAppearance.CategoryTitle"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginTop">16dp</item> - <item name="android:layout_marginStart">48dp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> + <item name="android:layout_marginStart">56dp</item> + <item name="android:textColor">?android:attr/colorAccent</item> </style> <style name="AppPermissionRadioButton" diff --git a/res/values/themes.xml b/res/values/themes.xml index ca24edc1..dcf30c19 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -20,6 +20,14 @@ <style name="Settings" parent="@android:style/Theme.DeviceDefault.Settings"> <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> + <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle</item> + </style> + <style name="TextAppearance.CategoryTitle" + parent="@*android:style/TextAppearance.DeviceDefault.Body2"> + <item name="android:textAllCaps">true</item> + <item name="android:textSize">11sp</item> + <!-- 0.8 Spacing, 0.8/11 = 0.072727273 --> + <item name="android:letterSpacing">0.072727273</item> </style> <style name="PagedListTheme" parent="Theme.Car.NoActionBar"> <item name="listItemPrimaryIconTint">?android:attr/textColorPrimary</item> |