diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-10 09:42:27 -0700 |
|---|---|---|
| committer | Vinod Krishnan <vinodkrishnan@google.com> | 2015-09-14 15:21:47 -0700 |
| commit | 03dc824d37099b29acb5a0aa28e881d5b05cce0e (patch) | |
| tree | 146c411c4375c59c6a11689b7d591a26c4afce4f /res/values-watch | |
| parent | 46fed54b3ee49e4bebabca50bcff5bceaece96b8 (diff) | |
| download | android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.gz android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.tar.bz2 android_packages_apps_PackageInstaller-03dc824d37099b29acb5a0aa28e881d5b05cce0e.zip | |
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
Diffstat (limited to 'res/values-watch')
| -rw-r--r-- | res/values-watch/colors.xml | 3 | ||||
| -rw-r--r-- | res/values-watch/dimens.xml | 7 | ||||
| -rw-r--r-- | res/values-watch/themes.xml | 12 |
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> |