diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-10 17:24:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 17:24:13 +0000 |
| commit | ef70f8e426d3414ea9b66c07b15330631a466ed5 (patch) | |
| tree | aff62daf78843581502f4ed0acd18288da7aa7c4 /packages/SystemUI/res | |
| parent | cc87cfa29c4b38d1f119bdce652918565b0fed0f (diff) | |
| parent | 0265657d7f8ad2d32a93fda9f9b47b0de79265b3 (diff) | |
| download | frameworks_base-ef70f8e426d3414ea9b66c07b15330631a466ed5.zip frameworks_base-ef70f8e426d3414ea9b66c07b15330631a466ed5.tar.gz frameworks_base-ef70f8e426d3414ea9b66c07b15330631a466ed5.tar.bz2 | |
Merge "Volume: Show row headers for cast streams." into mnc-dev
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/volume_dialog_row.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml index d12bf5d..c6aa588 100644 --- a/packages/SystemUI/res/layout/volume_dialog_row.xml +++ b/packages/SystemUI/res/layout/volume_dialog_row.xml @@ -22,15 +22,15 @@ <TextView android:id="@+id/volume_row_header" - style="?android:attr/textAppearanceButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" + android:textAppearance="@style/TextAppearance.Volume.Header" android:paddingBottom="0dp" android:paddingEnd="12dp" - android:paddingStart="13dp" - android:paddingTop="8dp" /> + android:paddingStart="12dp" + android:paddingTop="4dp" /> <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/volume_row_icon" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index bda39b1..67d3312 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -275,6 +275,11 @@ <item name="android:fontFamily">sans-serif</item> </style> + <style name="TextAppearance.Volume.Header"> + <item name="android:textSize">12sp</item> + <item name="android:textColor">@color/volume_slider_inactive</item> + </style> + <style name="TextAppearance.Volume.ZenSummary"> <item name="android:textSize">14sp</item> <item name="android:fontFamily">sans-serif-medium</item> |