From 03dc824d37099b29acb5a0aa28e881d5b05cce0e Mon Sep 17 00:00:00 2001
From: Vinod Krishnan <vinodkrishnan@google.com>
Date: Thu, 10 Sep 2015 09:42:27 -0700
Subject: Changing layout to make button animations work

- Fix the Permissions Dialogs for round layout
- Show animation for the buttons
- Also fixed the names ellipsis issue.
- Fixed the theming of the dialogs.

Bug: 23118402

Change-Id: I385c827ac41b06222334c36bfda2c70b346232a2
---
 res/values-round/dimens.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 res/values-round/dimens.xml

(limited to 'res/values-round/dimens.xml')

diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml
new file mode 100644
index 00000000..c41886c0
--- /dev/null
+++ b/res/values-round/dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<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_3button_margin_left">36dp</dimen>
+    <dimen name="conf_diag_3button_margin_bottom">12dp</dimen>
+
+</resources>
-- 
cgit v1.2.3


From 6161f39f583cf202969125757d78010bdc06457c Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Fri, 18 Sep 2015 17:18:10 -0700
Subject: Update Grant Permissions dialog to redlines

Changes:
    - Refactor the ViewHandler a bit to be more generic.
      This should help with another upcoming Wear dialog.
    - Update assets for buttons
    - Add deny asset
    - Fix margins and other UI number tweaks

BUG: 24133550
Change-Id: I330bdf3217fa5c554f71d9105a0475106b6f3e12
---
 res/values-round/dimens.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res/values-round/dimens.xml')

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>
-- 
cgit v1.2.3


From 6a5762884adc64ea95bd206c46d60031428e977c Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Mon, 5 Oct 2015 12:28:07 -0700
Subject: Permissions redline fixes

This fixes the button bar animation to work on round
devices and also fixes the max height animation to make
sure the vertical button layout animates to max height
when there are only two buttons.

Also adjust some redlines like margins on the buttons and
updated some files that were missing our licensing header.

Change-Id: Ifad4d0f92605be04db2d3c991b4e8a26eadb4b14
---
 res/values-round/dimens.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'res/values-round/dimens.xml')

diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml
index d9a522d4..5e7309b9 100644
--- a/res/values-round/dimens.xml
+++ b/res/values-round/dimens.xml
@@ -19,7 +19,5 @@
     <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_3button_margin_left">36dp</dimen>
-    <dimen name="conf_diag_3button_margin_bottom">24dp</dimen>
 
 </resources>
-- 
cgit v1.2.3


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/values-round/dimens.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/values-round/dimens.xml')

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>
-- 
cgit v1.2.3


From 51f646b19dfbe663fcd2ea78d10fd2813c4d20f8 Mon Sep 17 00:00:00 2001
From: Danny Epstein <depstein@google.com>
Date: Tue, 20 Oct 2015 10:04:27 -0700
Subject: Reduce the top padding when message isn't at top.

If either the page number or an icon is shown above the message,
reduce the top padding on round screens.

Bug: 24961379
Change-Id: Iec9193e3bbdd8ac607743cd0010f2331edbebc81
---
 res/values-round/dimens.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'res/values-round/dimens.xml')

diff --git a/res/values-round/dimens.xml b/res/values-round/dimens.xml
index ad0fbe03..bed41ce0 100644
--- a/res/values-round/dimens.xml
+++ b/res/values-round/dimens.xml
@@ -19,6 +19,8 @@
     <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>
+    <!-- On round screens, the message can't be too close to the top or the corners will be
+         clipped. -->
+    <dimen name="conf_diag_min_space_above_message">26dp</dimen>
 
 </resources>
-- 
cgit v1.2.3