diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-15 02:58:19 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-12-15 02:58:19 -0700 |
| commit | b687a3a2aa6b1a52ab919ca72f056389fbb2e4e8 (patch) | |
| tree | 933f97c4bddd3e5408c35a28a24f990095fedefe /res/layout/grant_permissions.xml | |
| parent | 41dc63be55dbd9fc40ae666c0f8ae7117a0d6681 (diff) | |
| parent | d139f8ced98480b2d11ed0be792f291a17218ddd (diff) | |
| download | android_packages_apps_PackageInstaller-b687a3a2aa6b1a52ab919ca72f056389fbb2e4e8.tar.gz android_packages_apps_PackageInstaller-b687a3a2aa6b1a52ab919ca72f056389fbb2e4e8.tar.bz2 android_packages_apps_PackageInstaller-b687a3a2aa6b1a52ab919ca72f056389fbb2e4e8.zip | |
Merge d139f8ced98480b2d11ed0be792f291a17218ddd on remote branch
Change-Id: Ib0c49c306aec1a4e6c5f1edbbb1065763a48fb3d
Diffstat (limited to 'res/layout/grant_permissions.xml')
| -rw-r--r-- | res/layout/grant_permissions.xml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml index 92c0df9d..8ed9c5d6 100644 --- a/res/layout/grant_permissions.xml +++ b/res/layout/grant_permissions.xml @@ -19,18 +19,21 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:clipChildren="false" - android:paddingLeft="@*android:dimen/floating_window_margin_left" - android:paddingRight="@*android:dimen/floating_window_margin_right" - android:paddingTop="@*android:dimen/floating_window_margin_top" - android:paddingBottom="@*android:dimen/floating_window_margin_bottom" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="32dp" android:clipToPadding="false"> + <ScrollView android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <LinearLayout android:id="@+id/dialog_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:elevation="@*android:dimen/floating_window_z" + android:elevation="16dp" android:background="@drawable/dialog_background"> <FrameLayout @@ -87,7 +90,7 @@ </TextView> <Space - android:id="@*android:id/spacer" + android:id="@+id/spacer" android:layout_width="0dp" android:layout_height="0dp" android:layout_weight="1" @@ -102,13 +105,13 @@ android:text="@string/grant_dialog_button_deny" > </Button> - <com.android.packageinstaller.permission.ui.SecureButtonView + <Button android:id="@+id/permission_allow_button" android:layout_width="wrap_content" android:layout_height="wrap_content" style="?android:attr/buttonBarButtonStyle" android:text="@string/grant_dialog_button_allow" > - </com.android.packageinstaller.permission.ui.SecureButtonView> + </Button> </com.android.packageinstaller.permission.ui.ButtonBarLayout> @@ -116,4 +119,6 @@ </LinearLayout> + </ScrollView> + </com.android.packageinstaller.permission.ui.ManualLayoutFrame> |