From 4b7427563d334dab50eb77028a78e709ea58880b Mon Sep 17 00:00:00 2001
From: Anthony Hugh <ahugh@google.com>
Date: Mon, 21 Sep 2015 15:49:08 -0700
Subject: Add new dialog for warning confirmations

This change updates the Wear warning dialog for when users try
to change permissions for system apps and apps that are targeting
old SDKs.

Because Wear does not have a common dialog yet, I needed to create
a new activity to hold our confirmation view.

Changes:
    - Update logic to show Wear confirmation screen instead of using
      AlertDialog
    - Added WarningConfirmationActivity
    - Change font size for confirmation dialog
    - Make ConfirmationViewHandler support hiding one of the 3 vertical
      buttons
    - rename grant_permissions.xml to more generic confirmation_dialog

BUG: 24132857

Change-Id: Id225e663f0a2cd7b99fb177f780a6a3d0da15214
---
 res/layout-watch/confirmation_dialog.xml | 119 +++++++++++++++++++++++++++++++
 res/layout-watch/grant_permissions.xml   | 119 -------------------------------
 res/values-watch/themes.xml              |   2 +-
 3 files changed, 120 insertions(+), 120 deletions(-)
 create mode 100644 res/layout-watch/confirmation_dialog.xml
 delete mode 100644 res/layout-watch/grant_permissions.xml

(limited to 'res')

diff --git a/res/layout-watch/confirmation_dialog.xml b/res/layout-watch/confirmation_dialog.xml
new file mode 100644
index 00000000..2eedae35
--- /dev/null
+++ b/res/layout-watch/confirmation_dialog.xml
@@ -0,0 +1,119 @@
+<?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.
+-->
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/confirmation"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <ScrollView
+            android:id="@+id/scrolling_container"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <LinearLayout
+                android:id="@+id/content"
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/conf_diag_button_container_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:id="@+id/current_page_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top"
+                    android:textAppearance="@style/GrantPermissions.BreadcrumbText" />
+
+            <ImageView
+                    android:id="@+id/icon"
+                    android:layout_width="@dimen/grant_permissions_app_icon_size"
+                    android:layout_height="@dimen/grant_permissions_app_icon_size"
+                    android:tint="@color/grant_permissions_app_color"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/>
+
+            <TextView
+                    android:id="@+id/message"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    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:textAppearance="@style/GrantPermissions.TitleText"/>
+        </LinearLayout>
+    </ScrollView>
+
+    <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts -->
+    <FrameLayout android:id="@+id/button_bar_container"
+                 android:layout_width="match_parent"
+                 android:layout_height="wrap_content"
+                 android:layout_gravity="bottom"
+                 android:background="#FF606060">
+        <FrameLayout
+            android:id="@+id/horizontal_button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/conf_diag_button_container_height">
+            <Button
+                android:id="@+id/horizontal_deny_button"
+                android:layout_width="54dp"
+                android:layout_height="54dp"
+                android:layout_gravity="top|left"
+                android:layout_marginLeft="@dimen/conf_diag_2button_margin_side"
+                android:layout_marginTop="@dimen/conf_diag_2button_margin_top"
+                android:background="@drawable/cancel_button"/>
+
+            <Button
+                android:id="@+id/horizontal_allow_button"
+                android:layout_width="54dp"
+                android:layout_height="54dp"
+                android:layout_gravity="top|right"
+                android:layout_marginRight="@dimen/conf_diag_2button_margin_side"
+                android:layout_marginTop="@dimen/conf_diag_2button_margin_top"
+                android:background="@drawable/confirm_button"/>
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/vertical_button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/conf_diag_3button_margin_left"
+            android:layout_marginBottom="@dimen/conf_diag_3button_margin_bottom"
+            android:visibility="gone">
+            <LinearLayout
+                android:id="@+id/buttonPanel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <Button
+                    android:id="@+id/vertical_button1"
+                    style="@style/Widget.WearDiag.Button"/>
+
+                <Button
+                    android:id="@+id/vertical_button2"
+                    style="@style/Widget.WearDiag.Button"/>
+
+                <Button
+                    android:id="@+id/vertical_button3"
+                    style="@style/Widget.WearDiag.Button"/>
+            </LinearLayout>
+        </FrameLayout>
+    </FrameLayout>
+</FrameLayout>
diff --git a/res/layout-watch/grant_permissions.xml b/res/layout-watch/grant_permissions.xml
deleted file mode 100644
index 2eedae35..00000000
--- a/res/layout-watch/grant_permissions.xml
+++ /dev/null
@@ -1,119 +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.
--->
-<FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/confirmation"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <ScrollView
-            android:id="@+id/scrolling_container"
-            android:overScrollMode="never"
-            android:scrollbars="none"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <LinearLayout
-                android:id="@+id/content"
-                android:orientation="vertical"
-                android:paddingBottom="@dimen/conf_diag_button_container_height"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-            <TextView
-                    android:id="@+id/current_page_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="@dimen/grant_permissions_app_breadcrumb_margin_top"
-                    android:textAppearance="@style/GrantPermissions.BreadcrumbText" />
-
-            <ImageView
-                    android:id="@+id/icon"
-                    android:layout_width="@dimen/grant_permissions_app_icon_size"
-                    android:layout_height="@dimen/grant_permissions_app_icon_size"
-                    android:tint="@color/grant_permissions_app_color"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="@dimen/grant_permissions_app_icon_margin_top"/>
-
-            <TextView
-                    android:id="@+id/message"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    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:textAppearance="@style/GrantPermissions.TitleText"/>
-        </LinearLayout>
-    </ScrollView>
-
-    <!-- TODO: Change this to use a ViewStub instead of show/hiding the two layouts -->
-    <FrameLayout android:id="@+id/button_bar_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="bottom"
-                 android:background="#FF606060">
-        <FrameLayout
-            android:id="@+id/horizontal_button_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/conf_diag_button_container_height">
-            <Button
-                android:id="@+id/horizontal_deny_button"
-                android:layout_width="54dp"
-                android:layout_height="54dp"
-                android:layout_gravity="top|left"
-                android:layout_marginLeft="@dimen/conf_diag_2button_margin_side"
-                android:layout_marginTop="@dimen/conf_diag_2button_margin_top"
-                android:background="@drawable/cancel_button"/>
-
-            <Button
-                android:id="@+id/horizontal_allow_button"
-                android:layout_width="54dp"
-                android:layout_height="54dp"
-                android:layout_gravity="top|right"
-                android:layout_marginRight="@dimen/conf_diag_2button_margin_side"
-                android:layout_marginTop="@dimen/conf_diag_2button_margin_top"
-                android:background="@drawable/confirm_button"/>
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/vertical_button_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/conf_diag_3button_margin_left"
-            android:layout_marginBottom="@dimen/conf_diag_3button_margin_bottom"
-            android:visibility="gone">
-            <LinearLayout
-                android:id="@+id/buttonPanel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <Button
-                    android:id="@+id/vertical_button1"
-                    style="@style/Widget.WearDiag.Button"/>
-
-                <Button
-                    android:id="@+id/vertical_button2"
-                    style="@style/Widget.WearDiag.Button"/>
-
-                <Button
-                    android:id="@+id/vertical_button3"
-                    style="@style/Widget.WearDiag.Button"/>
-            </LinearLayout>
-        </FrameLayout>
-    </FrameLayout>
-</FrameLayout>
diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml
index e20e35c2..882557e6 100644
--- a/res/values-watch/themes.xml
+++ b/res/values-watch/themes.xml
@@ -35,7 +35,7 @@
 
     <style name="GrantPermissions.TitleText">
         <item name="android:fontFamily">sans-serif-condensed-light</item>
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">18sp</item>
         <item name="android:textColor">@color/grant_permissions_title_color</item>
         <item name="android:lineSpacingMultiplier">1.221</item>
     </style>
-- 
cgit v1.2.3