am c1c11248: am aef4b9cd: am fb9be671: Merge "Update Grant Permissions dialog to redlines" into cw-e-dev

* commit 'c1c112489b404b2bc625b61de17a836f117a8a4b':
  Update Grant Permissions dialog to redlines

12 files changed, 28 insertions, 20 deletions

diff --git a/res/drawable-watch-280dpi/ic_cc_deny.png b/res/drawable-watch-280dpi/ic_cc_deny.png
new file mode 100644
index 00000000..1733669f
--- /dev/null
+++ b/res/drawable-watch-280dpi/ic_cc_deny.png
diff --git a/res/drawable-watch-hdpi/ic_cc_checkmark.png b/res/drawable-watch-hdpi/ic_cc_checkmark.png
index 29f9ecd9..a18fe7ab 100644
--- a/res/drawable-watch-hdpi/ic_cc_checkmark.png
+++ b/res/drawable-watch-hdpi/ic_cc_checkmark.png
diff --git a/res/drawable-watch-hdpi/ic_cc_deny.png b/res/drawable-watch-hdpi/ic_cc_deny.png
new file mode 100644
index 00000000..bab22a3d
--- /dev/null
+++ b/res/drawable-watch-hdpi/ic_cc_deny.png
diff --git a/res/drawable-watch-mdpi/ic_cc_checkmark.png b/res/drawable-watch-mdpi/ic_cc_checkmark.png
index 0989daa6..02c22b19 100644
--- a/res/drawable-watch-mdpi/ic_cc_checkmark.png
+++ b/res/drawable-watch-mdpi/ic_cc_checkmark.png
diff --git a/res/drawable-watch-mdpi/ic_cc_deny.png b/res/drawable-watch-mdpi/ic_cc_deny.png
new file mode 100644
index 00000000..f3b29f7f
--- /dev/null
+++ b/res/drawable-watch-mdpi/ic_cc_deny.png
diff --git a/res/drawable-watch-xhdpi/ic_cc_checkmark.png b/res/drawable-watch-xhdpi/ic_cc_checkmark.png
index f98cc1ec..1302723b 100644
--- a/res/drawable-watch-xhdpi/ic_cc_checkmark.png
+++ b/res/drawable-watch-xhdpi/ic_cc_checkmark.png
diff --git a/res/drawable-watch-xhdpi/ic_cc_deny.png b/res/drawable-watch-xhdpi/ic_cc_deny.png
new file mode 100644
index 00000000..a5f8dc1b
--- /dev/null
+++ b/res/drawable-watch-xhdpi/ic_cc_deny.png
diff --git a/res/drawable-watch/deny_button.xml b/res/drawable-watch/deny_button.xml
new file mode 100644
index 00000000..70ea453f
--- /dev/null
+++ b/res/drawable-watch/deny_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:drawable="@drawable/action_negative_bg" />
+    <item>
+        <bitmap android:src="@drawable/ic_cc_deny" android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/res/layout-watch/grant_permissions.xml b/res/layout-watch/grant_permissions.xml
index 165de29f..2eedae35 100644
--- a/res/layout-watch/grant_permissions.xml
+++ b/res/layout-watch/grant_permissions.xml
@@ -38,7 +38,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginBottom="@dimen/grant_permissions_app_breadcrumb_margin_bottom"
+                    android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top"
                     android:textAppearance="@style/GrantPermissions.BreadcrumbText" />
 
             <ImageView
@@ -53,20 +53,18 @@
                     android:id="@+id/message"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:textSize="20sp"
+                    android:layout_marginTop="@dimen/grant_permissions_title_margin_top"
+                    android:paddingLeft="@dimen/grant_permissions_message_side_padding"
+                    android:paddingRight="@dimen/grant_permissions_message_side_padding"
                     android:gravity="center"
-                    android:fontFamily="sans-serif-condensed-light"
                     android:textAppearance="@style/GrantPermissions.TitleText"/>
         </LinearLayout>
     </ScrollView>
 
     <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts -->
-    <FrameLayout android:layout_width="match_parent"
+    <FrameLayout android:id="@+id/button_bar_container"
+                 android:layout_width="match_parent"
                  android:layout_height="wrap_content"
-                 android:id="@+id/button_bar_container"
                  android:layout_gravity="bottom"
                  android:background="#FF606060">
         <FrameLayout
@@ -105,15 +103,15 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <Button
-                    android:id="@+id/vertical_allow_button"
+                    android:id="@+id/vertical_button1"
                     style="@style/Widget.WearDiag.Button"/>
 
                 <Button
-                    android:id="@+id/vertical_deny_button"
+                    android:id="@+id/vertical_button2"
                     style="@style/Widget.WearDiag.Button"/>
 
                 <Button
-                    android:id="@+id/vertical_deny_do_not_ask_again_button"
+                    android:id="@+id/vertical_button3"
                     style="@style/Widget.WearDiag.Button"/>
             </LinearLayout>
         </FrameLayout>
diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml
index c41886c0..d9a522d4 100644
--- a/res/values-round/dimens.xml
+++ b/res/values-round/dimens.xml
@@ -17,9 +17,9 @@
 <resources>
     <!-- Dimensions for the Grant permissions Confirmation Dialog -->
     <dimen name="conf_diag_button_container_height">96dp</dimen>
-    <dimen name="conf_diag_2button_margin_side">36dp</dimen>
-    <dimen name="conf_diag_2button_margin_top">12dp</dimen>
+    <dimen name="conf_diag_2button_margin_side">32dp</dimen>
+    <dimen name="conf_diag_2button_margin_top">10dp</dimen>
     <dimen name="conf_diag_3button_margin_left">36dp</dimen>
-    <dimen name="conf_diag_3button_margin_bottom">12dp</dimen>
+    <dimen name="conf_diag_3button_margin_bottom">24dp</dimen>
 
 </resources>
diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index 698ed5ca..fa657c73 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -15,15 +15,18 @@
 -->
 
 <resources>
-    <dimen name="grant_permissions_app_icon_size">32dp</dimen>
-    <dimen name="grant_permissions_app_icon_margin_top">8dp</dimen>
+    <dimen name="grant_permissions_app_icon_size">20dp</dimen>
+    <dimen name="grant_permissions_app_icon_margin_top">6dp</dimen>
 
-    <dimen name="grant_permissions_app_breadcrumb_margin_bottom">3dp</dimen>
+    <dimen name="grant_permissions_app_breadcrumb_margin_top">6dp</dimen>
+    <dimen name="grant_permissions_title_margin_top">6dp</dimen>
+    <dimen name="grant_permissions_message_side_padding">32dp</dimen>
 
     <dimen name="action_dialog_z">16dp</dimen>
 
     <!-- Dimensions for the Grant permissions Confirmation Dialog -->
     <dimen name="conf_diag_floating_height">16dp</dimen>
+    <dimen name="conf_diag_button_container_top_margin">6dp</dimen>
     <dimen name="conf_diag_button_container_height">72dp</dimen>
     <dimen name="conf_diag_2button_margin_side">16dp</dimen>
     <dimen name="conf_diag_2button_margin_top">9dp</dimen>
diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml
index b392c5c1..e20e35c2 100644
--- a/res/values-watch/themes.xml
+++ b/res/values-watch/themes.xml
@@ -29,13 +29,13 @@
 
     <style name="GrantPermissions.BreadcrumbText">
         <item name="android:fontFamily">sans-serif-condensed</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/grant_permissions_progress_color</item>
     </style>
 
     <style name="GrantPermissions.TitleText">
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:fontFamily">sans-serif-condensed-light</item>
+        <item name="android:textSize">20sp</item>
         <item name="android:textColor">@color/grant_permissions_title_color</item>
         <item name="android:lineSpacingMultiplier">1.221</item>
     </style>