Make permissions dialog mostly material compliant

Fixes: 21495581
Change-Id: I86bd21c0bf359b2169ba2552d24bccfcd3750484

3 files changed, 37 insertions, 17 deletions

diff --git a/res/drawable/dialog_background.xml b/res/drawable/dialog_background.xml
new file mode 100644
index 00000000..80049529
--- /dev/null
+++ b/res/drawable/dialog_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="?android:attr/colorBackground" />
+    </shape>
+</inset>
diff --git a/res/layout/grant_permissions.xml b/res/layout/grant_permissions.xml
index 185bade5..82823a03 100644
--- a/res/layout/grant_permissions.xml
+++ b/res/layout/grant_permissions.xml
@@ -24,16 +24,16 @@
         android:id="@+id/dialog_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:background="@drawable/dialog_background">
 
         <FrameLayout
             android:id="@+id/desc_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="24dip"
-            android:paddingStart="22dip"
-            android:paddingEnd="16dip"
-            android:background="?android:attr/colorBackgroundFloating">
+            android:paddingTop="18dip"
+            android:paddingStart="20dip"
+            android:paddingEnd="16dip">
             <include
                 layout="@layout/permission_description" />
         </FrameLayout>
@@ -42,8 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="8dip"
-            android:paddingStart="22dip"
+            android:paddingStart="20dip"
             android:paddingEnd="16dip"
             android:background="?android:attr/colorBackgroundFloating">
 
@@ -52,7 +51,9 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dip"
+                android:layout_marginBottom="-4dp"
                 android:text="@string/never_ask_again"
+                android:textColor="?android:attr/textColorPrimary"
                 style="?android:attr/textAppearanceSmall"
                 android:visibility="gone">
             </CheckBox>
@@ -62,15 +63,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                android:paddingStart="2dip"
-                android:paddingTop="16dip">
+                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:paddingTop="4dp"
-                    android:paddingBottom="4dp"
+                    android:layout_gravity="center_vertical"
                     android:paddingEnd="12dp"
                     android:singleLine="true"
                     style="?android:attr/textAppearanceSmall"
@@ -99,7 +101,6 @@
                     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>
 
diff --git a/res/layout/permission_description.xml b/res/layout/permission_description.xml
index 2a00e9bf..46b0e7cb 100644
--- a/res/layout/permission_description.xml
+++ b/res/layout/permission_description.xml
@@ -24,7 +24,6 @@
         android:id="@+id/permission_icon"
         android:layout_width="36dip"
         android:layout_height="36dip"
-        android:layout_marginTop="3dp"
         android:tint="?android:attr/colorAccent"
         android:scaleType="fitCenter" >
     </ImageView>
@@ -33,11 +32,9 @@
         android:id="@+id/permission_message"
         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">
+        android:textSize="20sp"
+        style="@android:style/TextAppearance.Material.Subhead">
     </TextView>
 
 </LinearLayout>