diff options
author | Philip P. Moltmann <moltmann@google.com> | 2018-09-12 16:09:45 -0700 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2018-09-12 16:15:03 -0700 |
commit | d64b3caf46e0560c077a4afab88e58a783b8bf4f (patch) | |
tree | e71be5981333ca236f52d39981a7ddfb8a27641e | |
parent | 42fe82afad77840f98ab3d0d25fa62a610b2606a (diff) | |
download | android_packages_apps_PackageInstaller-d64b3caf46e0560c077a4afab88e58a783b8bf4f.tar.gz android_packages_apps_PackageInstaller-d64b3caf46e0560c077a4afab88e58a783b8bf4f.tar.bz2 android_packages_apps_PackageInstaller-d64b3caf46e0560c077a4afab88e58a783b8bf4f.zip |
Make review permission UI themeable
... following the same method we did for the grant permission flow. I.e.
the theme and styles will be defined by the platform.
Change-Id: Ia3a4f0e00c387ec80a7a871039425d1ad5e7f4e0
Fixes: 113072200
Test: Looked at UI
-rw-r--r-- | AndroidManifest.xml | 2 | ||||
-rw-r--r-- | res/layout/review_permissions.xml | 27 | ||||
-rw-r--r-- | res/values/themes.xml | 6 |
3 files changed, 11 insertions, 24 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 88cd2ade..d21c8826 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,7 +57,7 @@ <activity android:name="com.android.packageinstaller.permission.ui.ReviewPermissionsActivity" android:excludeFromRecents="true" - android:theme="@style/Settings.NoActionBar" + android:theme="@style/ReviewPermissions" android:permission="android.permission.GRANT_RUNTIME_PERMISSIONS"> <intent-filter android:priority="1"> <action android:name="android.intent.action.REVIEW_PERMISSIONS" /> diff --git a/res/layout/review_permissions.xml b/res/layout/review_permissions.xml index 6a1c6b3e..a26277bb 100644 --- a/res/layout/review_permissions.xml +++ b/res/layout/review_permissions.xml @@ -18,32 +18,23 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginTop="32dip" - android:layout_marginBottom="8dip" android:orientation="vertical"> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:layout_marginBottom="16dip" - android:orientation="horizontal"> + android:orientation="horizontal" + style="@*android:style/PermissionReviewDescription"> <ImageView android:id="@+id/app_icon" - android:layout_width="36dip" - android:layout_height="36dip" - android:scaleType="fitCenter"> - </ImageView> + style="@*android:style/PermissionReviewTitleIcon" /> <TextView android:id="@+id/permissions_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dip" - style="?android:attr/textAppearanceMedium"> - </TextView> + style="?android:attr/titleTextStyle" /> </LinearLayout> @@ -51,17 +42,14 @@ android:id="@+id/preferences_frame" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginStart="2dip" - android:layout_marginEnd="2dip" - android:layout_weight="1"> - </FrameLayout> + android:layout_weight="1" + style="@*android:style/PermissionReviewSettings" /> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingStart="2dip" - android:paddingTop="16dip"> + style="?android:attr/buttonBarStyle"> <Button android:id="@+id/permission_more_info_button" @@ -101,7 +89,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" - android:layout_marginStart="8dip" android:text="@string/review_button_continue"> </Button> diff --git a/res/values/themes.xml b/res/values/themes.xml index 82dba4a9..3d35ac52 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -26,9 +26,9 @@ <item name="android:background">@color/car_card</item> </style> - <style name="Settings.NoActionBar" parent="@style/Settings"> - <item name="android:windowActionBar">false</item> - <item name="android:windowNoTitle">true</item> + <style name="ReviewPermissions" + parent="@*android:style/Theme.DeviceDefault.PermissionReviewApp"> + <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> </style> <style name="GrantPermissions" |