summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-08-11 19:29:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-11 18:41:55 +0000
commitc55dd2bc042a78e7dac8b9d1a4bb4b51c141a512 (patch)
treeba2935d5442116084505ac5dcc4b463ddf1a861f
parent9e229d80e58078ad9197e0b9b0ed2914b2ec6b75 (diff)
parentbc0a9fecf626d97091713a250b5661041231b091 (diff)
downloadframeworks_base-c55dd2bc042a78e7dac8b9d1a4bb4b51c141a512.zip
frameworks_base-c55dd2bc042a78e7dac8b9d1a4bb4b51c141a512.tar.gz
frameworks_base-c55dd2bc042a78e7dac8b9d1a4bb4b51c141a512.tar.bz2
Merge "QS: Update user switcher details" into lmp-dev
-rw-r--r--packages/SystemUI/res/values/colors.xml2
-rw-r--r--packages/SystemUI/res/values/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index cd73527..0cc74a8 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -49,7 +49,7 @@
<color name="data_usage_graph_track">#33FFFFFF</color><!-- 20% white -->
<color name="data_usage_graph_warning">#FFFFFFFF</color>
<color name="status_bar_clock_color">#FFFFFFFF</color>
- <color name="qs_user_detail_icon_muted">#4DB0BEC5</color> <!-- 30% blue grey 200-->
+ <color name="qs_user_detail_icon_muted">#FFFFFFFF</color> <!-- not so muted after all -->
<!-- Tint color for the content on the notification overflow card. -->
<color name="keyguard_overflow_content_color">#ff686868</color>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 13afeb4..93ed231 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -683,7 +683,7 @@
<string name="guest_nickname">Guest</string>
<!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
- <string name="guest_new_guest">+ Guest</string>
+ <string name="guest_new_guest">Add guest</string>
<!-- Label for exiting guest session in the user switcher [CHAR LIMIT=35] -->
<string name="guest_exit_guest">Exit guest</string>