diff options
| author | John Spurlock <jspurlock@google.com> | 2015-02-26 19:56:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-26 19:56:48 +0000 |
| commit | bd4b5b7fd0c5f7a2ec82ea130922541626dcc0fd (patch) | |
| tree | 2be00c542497d11f21186edfb1c7e789fb8634c4 | |
| parent | cd2a712f1b4498259116e442a95f8eeb6f7f3bd3 (diff) | |
| parent | 5b093fad7442fc916d771cacc851003043b41dee (diff) | |
| download | frameworks_base-bd4b5b7fd0c5f7a2ec82ea130922541626dcc0fd.zip frameworks_base-bd4b5b7fd0c5f7a2ec82ea130922541626dcc0fd.tar.gz frameworks_base-bd4b5b7fd0c5f7a2ec82ea130922541626dcc0fd.tar.bz2 | |
Merge "QS: Update detail button text color."
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 4c0cea8..d4aeab6 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -42,7 +42,8 @@ <color name="qs_tile_divider">#29ffffff</color><!-- 16% white --> <color name="qs_tile_text">#B3FFFFFF</color><!-- 70% white --> <color name="qs_subhead">#99FFFFFF</color><!-- 60% white --> - <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200--> + <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200 --> + <color name="qs_detail_button">#FFB0BEC5</color><!-- 100% blue grey 200 --> <color name="qs_detail_transition">#66FFFFFF</color> <color name="qs_detail_progress_track">#99009688</color><!-- 60% deep teal 500 --> <color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white --> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index bf19b8d..94f77c6 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -145,6 +145,7 @@ <style name="TextAppearance.QS.DetailButton"> <item name="android:textSize">@dimen/qs_detail_button_text_size</item> + <item name="android:textColor">@color/qs_detail_button</item> <item name="android:textAllCaps">true</item> <item name="android:fontFamily">sans-serif-medium</item> <item name="android:gravity">center</item> |