Update permissions UI to match new watch UI.

Bug: 29250733
Bug: 31779188
Change-Id: I814db5f94bdb840b04c5e8d9e12b565cfcd5fbc1

5 files changed, 10 insertions, 149 deletions

diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml
index b81d6e3b..81d0459c 100644
--- a/res/values-watch/colors.xml
+++ b/res/values-watch/colors.xml
@@ -15,22 +15,6 @@
 -->
 
 <resources>
-    <color name="grant_permissions_app_color">@color/grant_permissions_white_text_alpha_100</color>
-    <color name="grant_permissions_progress_color">@color/grant_permissions_white_text_alpha_100</color>
-    <color name="grant_permissions_title_color">@color/grant_permissions_white_text_alpha_70</color>
-
-    <color name="grant_permissions_white_text_alpha_100">@color/off_white</color>
-    <color name="grant_permissions_white_text_alpha_70">#b2eeeeee</color>
-
-    <color name="permissions_settings_item_color">#FFFFFFFF</color>
-
-    <color name="off_white">#ffeeeeee</color>
-
-    <color name="primary_text_light">#424242</color>
-
     <!-- Copied from wearable support -->
     <color name="circular_button_disabled">#757575</color>
-
-    <!-- Copied from wearable Clockwork Settings -->
-    <color name="cw_dark_gray">#424242</color>
 </resources>
diff --git a/res/values-watch/dimens.xml b/res/values-watch/dimens.xml
deleted file mode 100644
index 96f32148..00000000
--- a/res/values-watch/dimens.xml
+++ /dev/null
@@ -1,57 +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">20dp</dimen>
-    <dimen name="grant_permissions_app_icon_margin_top">6dp</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>
-    <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 -->
-    <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>
diff --git a/res/values-watch/strings.xml b/res/values-watch/strings.xml
index 82fe4ae9..f940eae6 100644
--- a/res/values-watch/strings.xml
+++ b/res/values-watch/strings.xml
@@ -30,8 +30,9 @@
     <!-- Summary of a permission switch when it's enforced by policy [CHAR LIMIT=17] -->
     <string name="permission_summary_enforced_by_policy">Can\'t be changed</string>
 
-    <!-- Generic text to indicate that a setting is enabled. Should be in all caps. [CHAR LIMIT=40] -->
-    <string name="generic_enabled">ENABLED</string>
-    <!-- Generic text to indicate that a setting is disabled. Should be in all caps. [CHAR LIMIT=40] -->
-    <string name="generic_disabled">DISABLED</string>
+    <!-- Generic text to indicate a yes. [CHAR LIMIT=10] -->
+    <string name="generic_yes">Yes</string>
+
+    <!-- Generic text to indicate Cancel. [CHAR LIMIT=10] -->
+    <string name="generic_cancel">Cancel</string>
 </resources>
diff --git a/res/values-watch/styles.xml b/res/values-watch/styles.xml
index 01ab90eb..18fce93e 100644
--- a/res/values-watch/styles.xml
+++ b/res/values-watch/styles.xml
@@ -17,33 +17,6 @@
 <resources>
     <style name="Theme.DialogWhenLarge" parent="@android:style/Theme.DeviceDefault.NoActionBar"/>
 
-    <!-- START: Ported values -->
-    <style name="TextAppearance.Wearable.Small" parent="android:TextAppearance.Medium">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/primary_text_light</item>
-    </style>
-
-    <style name="TextView.Small" parent="@android:style/Widget.Holo.Light">
-        <item name="android:fontFamily">sans-serif-condensed</item>
-        <item name="android:textAppearance">@style/TextAppearance.Wearable.Small</item>
-    </style>
-
-    <style name="TextView.Small.Light">
-        <item name="android:fontFamily">sans-serif-condensed-light</item>
-        <item name="android:textAppearance">@style/TextAppearance.Wearable.Small</item>
-    </style>
-
-    <style name="TextAppearance.Settings.Label" parent="android:TextAppearance.Medium">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#FFFFFFFF</item>
-    </style>
-
-    <style name="TextAppearance.Settings.Label.Large">
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="TextView.Settings.Label" parent="TextView.Small.Light">
-        <item name="android:textAppearance">@style/TextAppearance.Settings.Label</item>
-    </style>
-    <!-- END: Ported values -->
+    <style name="BreadcrumbText" parent="@android:style/TextAppearance.Material.Body2"/>
+    <style name="TitleText" parent="@android:style/TextAppearance.Material.Subhead"/>
 </resources>
diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml
index dea42907..a8186dd9 100644
--- a/res/values-watch/themes.xml
+++ b/res/values-watch/themes.xml
@@ -16,49 +16,9 @@
   -->
 
 <resources>
-    <style name="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Permissions</item>
-        <item name="android:windowBackground">@color/cw_dark_gray</item>
-        <item name="android:colorBackground">@color/cw_dark_gray</item>
-    </style>
-
-    <style name="GrantPermissions" parent="Settings">
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowElevation">@dimen/action_dialog_z</item>
-        <item name="android:windowSwipeToDismiss">false</item>
-    </style>
-
-    <style name="GrantPermissions.BreadcrumbText">
-        <item name="android:fontFamily">sans-serif-condensed</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/grant_permissions_progress_color</item>
-    </style>
+    <style name="Settings" parent="@android:style/Theme.DeviceDefault.NoActionBar" />
 
-    <style name="GrantPermissions.TitleText">
-        <item name="android:fontFamily">sans-serif-condensed-light</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>
-
-    <!-- Copied from WearableSupport lib -->
-    <style name="TextAppearance.WearDiag" parent="android:TextAppearance.Medium">
-        <item name="android:textColor">#FFFFFF</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-    <style name="TextAppearance.WearDiag.Button">
-        <item name="android:textSize">16sp</item>
-    </style>
-    <style name="Widget.WearDiag.Button" parent="@android:style/Widget.DeviceDefault.Button">
-        <item name="android:fontFamily">sans-serif-condensed-light</item>
-        <item name="android:gravity">center_vertical|left</item>
-        <item name="android:textAppearance">@style/TextAppearance.WearDiag.Button</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:minLines">1</item>
-        <item name="android:maxLines">3</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:layout_height">60dp</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:drawablePadding">12dp</item>
+    <style name="GrantPermissions" parent="@android:style/Theme.DeviceDefault.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 </resources>