From b4090d16e423700984d0a3e015938806bfd55327 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 27 Sep 2016 14:23:20 -0700
Subject: If the permission dialog would stick out, move it.

Also scroll the whole dialog if the screen is too small to for the
dialog.

Test: Executed steps in the bug. Dialog looks fine. Also toyed around
with display scaling and font scaling to make sure dialog always looks
ok (but might scroll) on very small displays.
Fixes: 31442798
Change-Id: I74328afde38ec2170a14aaa8e77675ad2164460e
(cherry picked from commit 3a5c306e5b6bf2285980aa34cb8eb00fbcf5ea2c)
---
 res/layout/grant_permissions.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'res')

diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index abb219a5..8ed9c5d6 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -25,6 +25,9 @@
     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"
@@ -116,4 +119,6 @@
 
     </LinearLayout>
 
+    </ScrollView>
+
 </com.android.packageinstaller.permission.ui.ManualLayoutFrame>
-- 
cgit v1.2.3