diff options
| author | Evan Severson <evanseverson@google.com> | 2019-02-01 12:59:20 -0800 |
|---|---|---|
| committer | Evan Severson <evanseverson@google.com> | 2019-02-06 13:57:16 -0800 |
| commit | 9a1eaf5a04b60657df4a2256730f3b7237286c1d (patch) | |
| tree | 353ec9e3714432b46e79e025202d5146a1c81d46 /res/values | |
| parent | f2cbd3121cd4fdf4a4ea24f886d299ba85b4c094 (diff) | |
| download | android_packages_apps_PackageInstaller-9a1eaf5a04b60657df4a2256730f3b7237286c1d.tar.gz android_packages_apps_PackageInstaller-9a1eaf5a04b60657df4a2256730f3b7237286c1d.tar.bz2 android_packages_apps_PackageInstaller-9a1eaf5a04b60657df4a2256730f3b7237286c1d.zip | |
Move attrs in review screen into styles for themeability
Test: appearance of permission review screen unchanged
Test: atest android.appssecurity.cts.PermissionHostTest
Change-Id: I5174888c93caa188e055f234122e077ce50f1157
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/styles.xml | 45 | ||||
| -rw-r--r-- | res/values/themes.xml | 1 |
2 files changed, 41 insertions, 5 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 485f91fe..7e8a135a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -128,7 +128,14 @@ <!-- END PERMISSION GRANT DIALOG --> - <!-- styles for the permission review screen. --> + <!-- START PERMISSION REVIEW SCREEN --> + + <style name="PermissionReview"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">match_parent</item> + <item name="android:orientation">vertical</item> + </style> + <style name="PermissionReviewDescription"> <item name="android:layout_marginTop">20dp</item> <item name="android:layout_marginStart">24dp</item> @@ -145,6 +152,8 @@ <style name="PermissionReviewTitleMessage" parent="@android:style/TextAppearance.DeviceDefault"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> <item name="android:paddingStart">22dp</item> <item name="android:textSize">20sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> @@ -156,9 +165,37 @@ </style> <style name="PermissionReviewButtonBar"> - <item name="android:layout_marginStart">24dp</item> - <item name="android:layout_marginEnd">16dp</item> - <item name="android:layout_marginBottom">4dp</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_gravity">bottom</item> + <item name="android:orientation">horizontal</item> + <item name="android:gravity">bottom</item> </style> + <style name="PermissionReviewButtonBarSpace"> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">0dp</item> + <item name="android:layout_weight">1</item> + <item name="android:visibility">invisible</item> + </style> + + <style name="PermissionReviewButton" + parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + </style> + + <style name="PermissionReviewButtonMoreInfo" + parent="@style/PermissionReviewButton"> + <item name="android:layout_gravity">bottom</item> + </style> + + <!-- for use in overlays --> + <style name="PermissionReviewButtonCancel" + parent="@style/PermissionReviewButton"></style> + <style name="PermissionReviewButtonContinue" + parent="@style/PermissionReviewButton"></style> + + <!-- END PERMISSION REVIEW SCREEN --> + </resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index cde50ae9..c890f41a 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -30,7 +30,6 @@ parent="@android:style/Theme.DeviceDefault.Settings"> <item name="android:windowActionBar">false</item> <item name="android:windowNoTitle">true</item> - <item name="android:titleTextStyle">@style/PermissionReviewTitleMessage</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> </style> |