From 42af15b6d9232ecf1f014ff69fbd86b8a0bc6b83 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Mon, 7 Dec 2015 17:33:53 -0800
Subject: Fix some UI glitches in PackageInstaller

1. Add missing tinting in ic_info.xml
2. Improve button stacking in the request permissions UI
3. Align text and icon in request permissions UI

bug:26071925

Change-Id: I12f631e902203d3f31970b28e420e20b7b454812
---
 res/drawable/ic_info.xml              |  3 ++-
 res/layout/grant_permissions.xml      | 37 ++++++++++++++++++++++-------------
 res/layout/permission_description.xml |  1 +
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml
index f80a41cb..029ff1b5 100644
--- a/res/drawable/ic_info.xml
+++ b/res/drawable/ic_info.xml
@@ -17,7 +17,8 @@ Copyright (C) 2015 The Android Open Source Project
         android:width="24.0dp"
         android:height="24.0dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:tint="?attr/colorControlNormal">
     <path
         android:pathData="M0 0h24v24H0z"
         android:fillColor="#00000000"/>
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 086a541a..463f0ccd 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -50,7 +50,7 @@
         <com.android.packageinstaller.permission.ui.ButtonBarLayout
             android:id="@+id/button_group"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:orientation="horizontal"
             android:paddingStart="2dip"
             android:paddingTop="16dip">
@@ -59,6 +59,7 @@
                 android:id="@+id/current_page_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|bottom"
                 android:paddingTop="4dp"
                 android:paddingBottom="4dp"
                 android:paddingEnd="12dp"
@@ -76,22 +77,30 @@
                 android:visibility="invisible" >
             </Space>
 
-            <Button
-                android:id="@+id/permission_deny_button"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="?android:attr/buttonBarButtonStyle"
-                android:text="@string/grant_dialog_button_deny" >
-            </Button>
+                android:layout_gravity="end"
+                android:orientation="horizontal" >
 
-            <Button
-                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>
+                <Button
+                    android:id="@+id/permission_deny_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:text="@string/grant_dialog_button_deny" >
+                </Button>
+
+                <Button
+                    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>
+
+            </LinearLayout>
 
         </com.android.packageinstaller.permission.ui.ButtonBarLayout>
 
diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml
index c9b60d64..2a00e9bf 100644
--- a/res/layout/permission_description.xml
+++ b/res/layout/permission_description.xml
@@ -34,6 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/permission_icon"
+        android:layout_marginTop="3dp"
         android:paddingStart="16dip"
         android:paddingEnd="8dip"
         style="?android:attr/textAppearanceMedium">
-- 
cgit v1.2.3