summaryrefslogtreecommitdiffstats
path: root/res/layout/grant_permissions.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout/grant_permissions.xml')
-rw-r--r--res/layout/grant_permissions.xml120
1 files changed, 65 insertions, 55 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 463f0ccd..860ef78d 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -17,71 +17,82 @@
<com.android.packageinstaller.permission.ui.ManualLayoutFrame
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="fill_parent" >
+ android:layout_height="fill_parent"
+ android:clipChildren="false"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="8dp"
+ android:paddingBottom="32dp"
+ android:clipToPadding="false">
<LinearLayout
android:id="@+id/dialog_container"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:paddingTop="24dip"
- android:paddingBottom="8dip"
- android:paddingStart="22dip"
- android:paddingEnd="16dip"
- android:orientation="vertical">
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:elevation="16dp"
+ android:background="@drawable/dialog_background">
<FrameLayout
android:id="@+id/desc_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content"
+ android:paddingTop="18dip"
+ android:paddingStart="20dip"
+ android:paddingEnd="16dip">
<include
layout="@layout/permission_description" />
</FrameLayout>
- <CheckBox
- android:id="@+id/do_not_ask_checkbox"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dip"
- android:text="@string/never_ask_again"
- style="?android:attr/textAppearanceSmall"
- android:visibility="gone">
- </CheckBox>
-
- <com.android.packageinstaller.permission.ui.ButtonBarLayout
- android:id="@+id/button_group"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal"
- android:paddingStart="2dip"
- android:paddingTop="16dip">
-
- <TextView
- android:id="@+id/current_page_text"
- android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingStart="20dip"
+ android:paddingEnd="16dip">
+
+ <CheckBox
+ android:id="@+id/do_not_ask_checkbox"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_gravity="start|bottom"
- android:paddingTop="4dp"
- android:paddingBottom="4dp"
- android:paddingEnd="12dp"
- android:singleLine="true"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="-12dp"
+ android:minHeight="48dp"
+ android:text="@string/never_ask_again"
+ android:textColor="?android:attr/textColorPrimary"
style="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:visibility="invisible">
- </TextView>
-
- <Space
- android:id="@*android:id/spacer"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:visibility="invisible" >
- </Space>
-
- <LinearLayout
- android:layout_width="wrap_content"
+ android:visibility="gone">
+ </CheckBox>
+
+ <com.android.packageinstaller.permission.ui.ButtonBarLayout
+ android:id="@+id/button_group"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:paddingStart="6dip"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:gravity="bottom">
+
+ <TextView
+ android:id="@+id/current_page_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingEnd="12dp"
+ android:singleLine="true"
+ style="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondary"
+ android:visibility="invisible">
+ </TextView>
+
+ <Space
+ android:id="@*android:id/spacer"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:visibility="invisible" >
+ </Space>
<Button
android:id="@+id/permission_deny_button"
@@ -91,18 +102,17 @@
android:text="@string/grant_dialog_button_deny" >
</Button>
- <Button
+ <com.android.packageinstaller.permission.ui.SecureButtonView
android:id="@+id/permission_allow_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:attr/buttonBarButtonStyle"
- android:layout_marginStart="8dip"
android:text="@string/grant_dialog_button_allow" >
- </Button>
+ </com.android.packageinstaller.permission.ui.SecureButtonView>
- </LinearLayout>
+ </com.android.packageinstaller.permission.ui.ButtonBarLayout>
- </com.android.packageinstaller.permission.ui.ButtonBarLayout>
+ </LinearLayout>
</LinearLayout>