summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2014-11-10 15:39:20 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-11-10 15:39:22 +0000
commit3e54ce273abafec3a0eca9e7064d5151ec096f0b (patch)
tree33e40d6220663d2a041a107a0ee938ba56f51dec
parent8f7d3715c5b26069a55464b1d3e517c6ecc600c7 (diff)
parentae52c5644874097e33081fb390d5730ca720f504 (diff)
Merge "Adjust owner info to spec" into lmp-mr1-dev
-rw-r--r--packages/Keyguard/res/layout/keyguard_status_view.xml2
-rw-r--r--packages/Keyguard/res/values/colors.xml2
-rw-r--r--packages/Keyguard/res/values/dimens.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/Keyguard/res/layout/keyguard_status_view.xml
index 185826149fa0..69f510e320da 100644
--- a/packages/Keyguard/res/layout/keyguard_status_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_status_view.xml
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/date_owner_info_margin"
android:layout_gravity="center_horizontal"
- android:textColor="#ccffffff"
+ android:textColor="@color/clock_gray"
android:textSize="@dimen/widget_label_font_size"
android:ellipsize="marquee"
android:singleLine="true" />
diff --git a/packages/Keyguard/res/values/colors.xml b/packages/Keyguard/res/values/colors.xml
index a9e80616bc43..4e28eff08293 100644
--- a/packages/Keyguard/res/values/colors.xml
+++ b/packages/Keyguard/res/values/colors.xml
@@ -26,5 +26,5 @@
<!-- Clock -->
<color name="clock_white">#ffffffff</color>
- <color name="clock_gray">#80ffffff</color>
+ <color name="clock_gray">#99ffffff</color>
</resources>
diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml
index fb7480c7ccbe..8326d7579f87 100644
--- a/packages/Keyguard/res/values/dimens.xml
+++ b/packages/Keyguard/res/values/dimens.xml
@@ -174,7 +174,7 @@
<dimen name="password_char_padding">8dp</dimen>
<!-- The vertical margin between the date and the owner info. -->
- <dimen name="date_owner_info_margin">10dp</dimen>
+ <dimen name="date_owner_info_margin">6dp</dimen>
<!-- The translation for disappearing security views after having solved them. -->
<dimen name="disappear_y_translation">-32dp</dimen>