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/SystemUI/res | |
| 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/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 69fbc1b..24ccb2b 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -45,6 +45,15 @@ android:layout_marginTop="@dimen/status_bar_height" android:visibility="gone" /> + <com.android.keyguard.CarrierText + android:id="@+id/keyguard_carrier_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="2dp" + android:layout_marginLeft="8dp" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" /> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" |