diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-28 12:21:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-28 12:21:57 +0000 |
| commit | 46da668b1341da12664a65b5a54eed40ed890a66 (patch) | |
| tree | 8b56ba926fcbe09e0ed705079180ef7f39f9eb07 /packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml | |
| parent | 370ff853fa14c0e407ba107dc456223e3daf52b0 (diff) | |
| parent | b039603867176c01c84ec1cbae681cb9868a4525 (diff) | |
| download | frameworks_base-46da668b1341da12664a65b5a54eed40ed890a66.zip frameworks_base-46da668b1341da12664a65b5a54eed40ed890a66.tar.gz frameworks_base-46da668b1341da12664a65b5a54eed40ed890a66.tar.bz2 | |
am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner."
* commit '3daa96f406d2cb46b55d71c696ce81656a7a2682':
Add carrier text on lockscreen in top left corner.
Diffstat (limited to 'packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml')
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml index b4847f0..b2d0219 100644 --- a/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml +++ b/packages/Keyguard/res/layout/keyguard_emergency_carrier_area.xml @@ -20,6 +20,7 @@ <!-- This contains emergency call button and carrier as shared by pin/pattern/password screens --> <com.android.keyguard.EmergencyCarrierArea xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:androidprv="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -35,7 +36,8 @@ android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" android:textSize="@dimen/kg_status_line_font_size" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="?android:attr/textColorSecondary" + androidprv:allCaps="@bool/kg_use_all_caps" /> <LinearLayout android:layout_width="match_parent" |