diff options
| author | Cole Faust <colefaust@google.com> | 2020-03-12 15:33:06 -0700 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2020-03-13 17:08:34 +0000 |
| commit | e861749b6537943ed0197dc712f8a8722baf0cac (patch) | |
| tree | 944ac029b7089c7302351ca58017dd3342f25146 /res/values | |
| parent | d08040fabe25bd81db1100c578b98bf03884a1a0 (diff) | |
| download | android_packages_apps_PackageInstaller-e861749b6537943ed0197dc712f8a8722baf0cac.tar.gz android_packages_apps_PackageInstaller-e861749b6537943ed0197dc712f8a8722baf0cac.tar.bz2 android_packages_apps_PackageInstaller-e861749b6537943ed0197dc712f8a8722baf0cac.zip | |
DO NOT MERGE: Chassify PermissionController
This was chassified in P, but never made it's way to Q
because it was renamed from PackageInstaller -> PermissionController
Not using baselayouts yet.
Fixes: 151254284
Test: Manually
Change-Id: Ia489787a89b076722c540a19521a344b71816a31
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/overlayable.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 17 | ||||
| -rw-r--r-- | res/values/themes.xml | 8 |
3 files changed, 1 insertions, 30 deletions
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 6d0dda5a..2bcb571a 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -248,14 +248,8 @@ <item type="dimen" name="car_icon_size" /> <!-- END CAR DIMENS --> - <!-- START CAR STYLES --> - <item type="style" name="CarPreferenceFragment" /> - <item type="style" name="CarPreferenceFragmentList" /> - <!-- END CAR STYLES --> - <!-- START CAR THEMES --> <item type="style" name="CarSettings" /> - <item type="style" name="CarPreferenceTheme" /> <!-- END CAR THEMES --> </policy> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5516dbe3..55c47787 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -869,21 +869,4 @@ <!-- END ACCESSIBILITY SERVICE DIALOG ITEM --> - <!-- START CAR SETTINGS PREFERENCE STYLES --> - - <style name="CarPreferenceFragment"> - <item name="android:layout">@layout/car_settings_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 b8ed550a..fb456402 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -77,14 +77,8 @@ parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"> </style> - <style name="CarSettings" parent="@android:style/Theme.DeviceDefault.NoActionBar"> - <item name="preferenceTheme">@style/CarPreferenceTheme</item> + <style name="CarSettings" parent="Theme.CarUi"> <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> |