diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-24 18:46:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 18:47:08 +0000 |
| commit | 6b0f384f0042c21129466c100e20aec1a325a8da (patch) | |
| tree | 899b8a71829d9e5f6e611b8b9a3be4ecc36cf552 /packages/SystemUI/res | |
| parent | 67f170993fda3a5b629dc4c55ec52db99176d3df (diff) | |
| parent | 22def3d4ebe47d39a03447f46a945228f565a1bf (diff) | |
| download | frameworks_base-6b0f384f0042c21129466c100e20aec1a325a8da.zip frameworks_base-6b0f384f0042c21129466c100e20aec1a325a8da.tar.gz frameworks_base-6b0f384f0042c21129466c100e20aec1a325a8da.tar.bz2 | |
Merge "Volume Motion: Initial show and expand transition." into mnc-dev
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/volume_dialog.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/volume_dialog_row.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 0ed1e2a..7617ed4 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -18,7 +18,7 @@ android:id="@+id/volume_dialog" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" + android:layout_marginBottom="@dimen/volume_dialog_margin_bottom" android:layout_marginLeft="@dimen/notification_side_padding" android:layout_marginRight="@dimen/notification_side_padding" android:background="@drawable/volume_dialog_background" diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml index c6aa588..1a6d34e 100644 --- a/packages/SystemUI/res/layout/volume_dialog_row.xml +++ b/packages/SystemUI/res/layout/volume_dialog_row.xml @@ -17,6 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" + android:id="@+id/volume_dialog_row" android:paddingEnd="8dp" android:paddingStart="8dp" > diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 869b03a..005077f 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -576,6 +576,9 @@ <!-- Standard image button size for volume dialog buttons --> <dimen name="volume_button_size">48dp</dimen> + <!-- Volume dialog root view bottom margin, at rest --> + <dimen name="volume_dialog_margin_bottom">4dp</dimen> + <!-- Padding between icon and text for managed profile toast --> <dimen name="managed_profile_toast_padding">4dp</dimen> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 67d3312..1889862 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -291,11 +291,6 @@ <item name="android:textColor">#ffb0b3c5</item> </style> - <style name="VolumeDialogAnimations"> - <item name="android:windowEnterAnimation">@android:anim/fade_in</item> - <item name="android:windowExitAnimation">@android:anim/fade_out</item> - </style> - <style name="VolumeButtons" parent="@android:style/Widget.Material.Button.Borderless"> <item name="android:background">@drawable/btn_borderless_rect</item> </style> |