From dc40bd77b1ab709de9d705c88f56ff61d618ed5c Mon Sep 17 00:00:00 2001
From: Danny Epstein <depstein@google.com>
Date: Mon, 19 Oct 2015 16:52:06 -0700
Subject: Add top padding to grant permission content.

Add top padding to the content inside the scroll view for the grant
permission dialog so that you can read the beginning of the text on
round watches.

Bug: 24961379
Change-Id: I9311fbaabd72bd8f8aee4f71845c1ae11bfeab8c
---
 res/layout-watch/confirmation_dialog.xml                               | 3 ++-
 res/values-round/dimens.xml                                            | 1 +
 res/values-watch/dimens.xml                                            | 1 +
 .../packageinstaller/permission/ui/wear/ConfirmationViewHandler.java   | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml
index 0b93579e..32e0657d 100644
--- a/res/layout-watch/confirmation_dialog.xml
+++ b/res/layout-watch/confirmation_dialog.xml
@@ -30,7 +30,8 @@
                 android:id="@+id/content"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:paddingTop="@dimen/conf_diag_content_padding_top">
 
             <TextView
                     android:id="@+id/current_page_text"
diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml
index 5e7309b9..ad0fbe03 100644
--- a/res/values-round/dimens.xml
+++ b/res/values-round/dimens.xml
@@ -19,5 +19,6 @@
     <dimen name="conf_diag_button_container_height">96dp</dimen>
     <dimen name="conf_diag_2button_margin_side">32dp</dimen>
     <dimen name="conf_diag_2button_margin_top">10dp</dimen>
+    <dimen name="conf_diag_content_padding_top">32dp</dimen>
 
 </resources>
diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index 24d2a058..aa5652df 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -32,6 +32,7 @@
     <dimen name="conf_diag_2button_margin_top">9dp</dimen>
     <dimen name="conf_diag_3button_padding_side">32dp</dimen>
     <dimen name="conf_diag_3button_padding_bottom">22dp</dimen>
+    <dimen name="conf_diag_content_padding_top">6dp</dimen>
 
 
     <!-- START: Ported values -->
diff --git a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
index db3340f6..abaf3e48 100644
--- a/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java
@@ -189,7 +189,7 @@ public abstract class ConfirmationViewHandler implements
         // In order to fake the buttons peeking at the bottom, need to do set the
         // padding properly.
         if (mContent.getPaddingBottom() != mButtonBarContainer.getHeight()) {
-            mContent.setPadding(0, 0, 0, mButtonBarContainer.getHeight());
+            mContent.setPadding(0, mContent.getPaddingTop(), 0, mButtonBarContainer.getHeight());
             if (Log.isLoggable(TAG, Log.DEBUG)) {
                 Log.d(TAG, "    set mContent.PaddingBottom: " + mButtonBarContainer.getHeight());
             }
-- 
cgit v1.2.3