From b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5 Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Wed, 19 Aug 2015 11:44:43 -0700
Subject: Implement base version of GrantPermissions dialog

With the Emerald release, we need to support the new
permission APIs.  This changelist adds a dialog
for the Activity.requestPermissions() API so that
users can request permissions.

This check in is a functional version, but not polished.
will need to be a follow up CL to add the correct
animations and update the UI to the appropriate redlines.

The implementation for the confirmation dialog is modeled
after the one in the clockwork libs/Views folder.  There
are some tweaks to match the designed behavior of the
permission dialog.  When there's more time in the future,
we should try to condense this to one implementation.

BUG: 23118402

Change-Id: Ic90d37a2ce8a7adacb7c4e004b0a5260b624f5c8
---
 res/values-watch/dimens.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 res/values-watch/dimens.xml

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
new file mode 100644
index 00000000..29a65fdc
--- /dev/null
+++ b/res/values-watch/dimens.xml
@@ -0,0 +1,28 @@
+<?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>
+    <dimen name="grant_permissions_app_icon_size">32dp</dimen>
+    <dimen name="grant_permissions_app_icon_margin_top">8dp</dimen>
+
+    <dimen name="grant_permissions_app_breadcrumb_margin_bottom">3dp</dimen>
+
+    <dimen name="action_dialog_z">16dp</dimen>
+
+    <!-- Confirmation Dialog -->
+    <dimen name="conf_diag_floating_height">16dp</dimen>
+
+</resources>
-- 
cgit v1.2.3


From 70d651e904e16723f4e55879f2e356e403fff61a Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Fri, 21 Aug 2015 20:57:03 +0000
Subject: Revert "Implement base version of GrantPermissions dialog"

This reverts commit b7da1f5f9886ff8a4ad81b0d617d442c461ca1e5.
We can't reference vendor from this package.  Need to add the references
manually.

Change-Id: I3ee31de110f24014100ce804b0659055b26f963b
---
 res/values-watch/dimens.xml | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 res/values-watch/dimens.xml

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
deleted file mode 100644
index 29a65fdc..00000000
--- a/res/values-watch/dimens.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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>
-    <dimen name="grant_permissions_app_icon_size">32dp</dimen>
-    <dimen name="grant_permissions_app_icon_margin_top">8dp</dimen>
-
-    <dimen name="grant_permissions_app_breadcrumb_margin_bottom">3dp</dimen>
-
-    <dimen name="action_dialog_z">16dp</dimen>
-
-    <!-- Confirmation Dialog -->
-    <dimen name="conf_diag_floating_height">16dp</dimen>
-
-</resources>
-- 
cgit v1.2.3


From 9478120abc48a8934e5de14f7cf49342cef5485c Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Wed, 19 Aug 2015 11:44:43 -0700
Subject: Implement base version of GrantPermissions dialog

With the Emerald release, we need to support the new
permission APIs.  This changelist adds a dialog
for the Activity.requestPermissions() API so that
users can request permissions.

This check in is a functional version, but not polished.
will need to be a follow up CL to add the correct
animations and update the UI to the appropriate redlines.

The implementation for the confirmation dialog is modeled
after the one in the clockwork libs/Views folder.  There
are some tweaks to match the designed behavior of the
permission dialog.  When there's more time in the future,
we should try to condense this to one implementation.

This is a resubmit without the wearable-support lib.
I will figure out how to get that referenced in the next
UI pass.

BUG: 23118402
Change-Id: Ib2fb94b356aa965b999b3e12726fda86928a963e
---
 res/values-watch/dimens.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 res/values-watch/dimens.xml

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
new file mode 100644
index 00000000..29a65fdc
--- /dev/null
+++ b/res/values-watch/dimens.xml
@@ -0,0 +1,28 @@
+<?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>
+    <dimen name="grant_permissions_app_icon_size">32dp</dimen>
+    <dimen name="grant_permissions_app_icon_margin_top">8dp</dimen>
+
+    <dimen name="grant_permissions_app_breadcrumb_margin_bottom">3dp</dimen>
+
+    <dimen name="action_dialog_z">16dp</dimen>
+
+    <!-- Confirmation Dialog -->
+    <dimen name="conf_diag_floating_height">16dp</dimen>
+
+</resources>
-- 
cgit v1.2.3


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-watch/dimens.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index 29a65fdc..9f484d3a 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -22,7 +22,12 @@
 
     <dimen name="action_dialog_z">16dp</dimen>
 
-    <!-- Confirmation Dialog -->
+    <!-- Dimensions for the Grant permissions Confirmation Dialog -->
     <dimen name="conf_diag_floating_height">16dp</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>
+    <dimen name="conf_diag_3button_margin_left">16dp</dimen>
+    <dimen name="conf_diag_3button_margin_bottom">9dp</dimen>
 
 </resources>
-- 
cgit v1.2.3


From 6412dc4a8f47b134af6c5abb5f7f30321bb3ce68 Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Mon, 14 Sep 2015 15:43:25 -0700
Subject: Permissions Watch settings UI port

This CL contains all the UI elements needed to build the Wear
version of the Settings UI for permissions.

The actual implementation for the Wear version of SettingsUI
will be done in a follow up bug.

This is basically a straight port from our Settings app and
wearable-support lib.  I tweaked two strings and changed
the package paths to make it easier to group the files
together.

BUG: 23080561

Change-Id: I6d72d29dd1926ad07d63f85b52ccf9f72ff70df1
---
 res/values-watch/dimens.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index 29a65fdc..80f26692 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -25,4 +25,22 @@
     <!-- Confirmation Dialog -->
     <dimen name="conf_diag_floating_height">16dp</dimen>
 
+
+    <!-- START: Ported values -->
+    <item name="default_settings_circle_radius_percent" format="fraction" type="dimen">40%</item>
+    <item name="selected_settings_circle_radius_percent" format="fraction" type="dimen">50%</item>
+    <dimen name="round_content_padding_left">40dp</dimen>
+    <dimen name="round_content_padding_right">24dp</dimen>
+    <dimen name="content_padding_left">12dp</dimen>
+    <dimen name="settings_wearable_list_view_vertical_padding_round">14dp</dimen>
+    <dimen name="setting_header_extra_line_height">16dp</dimen>
+    <dimen name="setting_long_header_text_size">20dp</dimen>
+    <dimen name="settings_header_base_height">50dp</dimen>
+    <dimen name="settings_header_top_margin">14dp</dimen>
+    <dimen name="settings_header_top_margin_circular">18dp</dimen>
+    <dimen name="settings_header_top_margin_multiline">6dp</dimen>
+    <dimen name="settings_header_top_margin_circular_multiline">16dp</dimen>
+    <dimen name="setting_short_header_text_size">24dp</dimen>
+    <dimen name="settings_text_margin_left">10dp</dimen>
+    <!-- END: Ported values -->
 </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-watch/dimens.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

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>
-- 
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-watch/dimens.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index fa657c73..24d2a058 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -30,8 +30,8 @@
     <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>
-    <dimen name="conf_diag_3button_margin_left">16dp</dimen>
-    <dimen name="conf_diag_3button_margin_bottom">9dp</dimen>
+    <dimen name="conf_diag_3button_padding_side">32dp</dimen>
+    <dimen name="conf_diag_3button_padding_bottom">22dp</dimen>
 
 
     <!-- START: Ported values -->
-- 
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-watch/dimens.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 -->
-- 
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-watch/dimens.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
index aa5652df..96f32148 100644
--- a/res/values-watch/dimens.xml
+++ b/res/values-watch/dimens.xml
@@ -33,6 +33,8 @@
     <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>
+    <!-- On square screens, the message can be at the top of the screen. -->
+    <dimen name="conf_diag_min_space_above_message">0dp</dimen>
 
 
     <!-- START: Ported values -->
-- 
cgit v1.2.3