Merge "Move attrs in review screen into styles for themeability" (3b79dc5d) · Commits · e / os / android_packages_apps_PackageInstaller

res/layout/review_permissions.xml

+16 −31

Original line number	Diff line number	Diff line
		@@ -16,83 +16,68 @@

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:orientation="vertical">
		style="@style/PermissionReview">

		<LinearLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:visibility="visible"
		style="@style/PermissionReviewDescription">

		<ImageView
		android:id="@+id/app_icon"
		android:visibility="visible"
		style="@style/PermissionReviewTitleIcon" />

		<TextView
		android:id="@+id/permissions_message"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="?android:attr/titleTextStyle" />
		android:visibility="visible"
		style="@style/PermissionReviewTitleMessage" />

		</LinearLayout>

		<FrameLayout
		android:id="@+id/preferences_frame"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:visibility="visible"
		style="@style/PermissionReviewSettings" />

		<LinearLayout
		android:layout_width="fill_parent"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		style="?android:attr/buttonBarStyle">

		<Button
		android:id="@+id/permission_more_info_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:visibility="gone"
		style="?android:attr/buttonBarButtonStyle"
		style="@style/PermissionReviewButtonMoreInfo"
		android:text="@string/grant_dialog_button_more_info">
		</Button>

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:visibility="invisible">
		style="@style/PermissionReviewButtonBarSpace">
		</Space>

		<com.android.packageinstaller.permission.ui.ButtonBarLayout
		<LinearLayout
		android:id="@+id/button_group"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="bottom"
		android:orientation="horizontal"
		android:gravity="bottom">
		style="@style/PermissionReviewButtonBar">

		<Button
		android:id="@+id/cancel_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="?android:attr/buttonBarButtonStyle"
		style="@style/PermissionReviewButtonCancel"
		android:text="@string/review_button_cancel">
		</Button>

		<Button
		android:id="@+id/continue_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="?android:attr/buttonBarButtonStyle"
		style="@style/PermissionReviewButtonContinue"
		android:text="@string/review_button_continue">
		</Button>

		</com.android.packageinstaller.permission.ui.ButtonBarLayout>
		</LinearLayout>

		</LinearLayout>

res/values/styles.xml

+41 −4

Original line number	Diff line number	Diff line
		@@ -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>

res/values/themes.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>