summaryrefslogtreecommitdiffstats
path: root/res/values-watch
diff options
context:
space:
mode:
Diffstat (limited to 'res/values-watch')
-rw-r--r--res/values-watch/colors.xml3
-rw-r--r--res/values-watch/dimens.xml7
-rw-r--r--res/values-watch/themes.xml12
3 files changed, 13 insertions, 9 deletions
diff --git a/res/values-watch/colors.xml b/res/values-watch/colors.xml
index 903bfef5..d662f254 100644
--- a/res/values-watch/colors.xml
+++ b/res/values-watch/colors.xml
@@ -26,4 +26,7 @@
<!-- 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
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>
diff --git a/res/values-watch/themes.xml b/res/values-watch/themes.xml
index 7a27bf7c..b392c5c1 100644
--- a/res/values-watch/themes.xml
+++ b/res/values-watch/themes.xml
@@ -16,13 +16,14 @@
-->
<resources>
- <style name="Settings" parent="Theme.Leanback">
+ <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="Theme.Leanback">
+ <style name="GrantPermissions" parent="Settings">
<item name="android:windowIsFloating">true</item>
- <item name="android:windowAnimationStyle">@style/Animation.Snackbar</item>
<item name="android:windowElevation">@dimen/action_dialog_z</item>
</style>
@@ -39,11 +40,6 @@
<item name="android:lineSpacingMultiplier">1.221</item>
</style>
- <style name="Animation.Snackbar" parent="@android:style/Animation">
- <item name="android:windowEnterAnimation">@anim/snackbar_enter</item>
- <item name="android:windowExitAnimation">@anim/snackbar_exit</item>
- </style>
-
<!-- Copied from WearableSupport lib -->
<style name="TextAppearance.WearDiag" parent="android:TextAppearance.Medium">
<item name="android:textColor">#FFFFFF</item>