diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-01-28 13:19:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-28 13:19:56 -0800 |
| commit | 1ad05dcbf506d489a99ecd9f308874d2a453db29 (patch) | |
| tree | fa8aeb3aee0a5d2da4385414019f02f3ef4fac06 | |
| parent | 254cb446faa7cb13699d8150eb4cc4f44cb61a2d (diff) | |
| parent | e096ddee54e022859bedc9f13b0c2d690dc5110e (diff) | |
| download | frameworks_base-1ad05dcbf506d489a99ecd9f308874d2a453db29.zip frameworks_base-1ad05dcbf506d489a99ecd9f308874d2a453db29.tar.gz frameworks_base-1ad05dcbf506d489a99ecd9f308874d2a453db29.tar.bz2 | |
Merge "resolved conflicts for merge of 33ca1f32 to master"
5 files changed, 24 insertions, 5 deletions
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 1f7f8f7..009148f 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -33,9 +33,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:lines="2" + android:singleLine="true" android:textAppearance="?android:attr/textAppearanceLarge"/> + <!-- Carrier info --> + <TextView android:id="@+id/carrier" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="9dip" + android:gravity="center" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium"/> + <!-- password entry --> <LinearLayout android:layout_width="match_parent" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index f9566d8..fd34f7b 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -28,7 +28,7 @@ android:background="#70000000" android:gravity="center_horizontal" android:id="@+id/root"> - + <TextView android:id="@+id/carrier" android:layout_width="wrap_content" @@ -37,6 +37,8 @@ android:layout_alignParentRight="true" android:layout_marginTop="10dip" android:layout_marginRight="8dip" + android:singleLine="true" + android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -144,7 +146,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginBottom="80dip" + android:layout_marginBottom="80dip" /> </RelativeLayout> diff --git a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml index 9965554..617b738 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -27,7 +27,7 @@ android:orientation="horizontal" android:background="#70000000" android:id="@+id/root"> - + <!-- left side --> <RelativeLayout android:layout_width="0dip" @@ -42,6 +42,8 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_marginTop="20dip" + android:singleLine="true" + android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/core/res/res/layout/keyguard_screen_unlock_landscape.xml b/core/res/res/layout/keyguard_screen_unlock_landscape.xml index 58f36ed..efd2044 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -54,6 +54,8 @@ android:textSize="17sp" android:drawablePadding="4dip" android:layout_marginTop="32dip" + android:singleLine="true" + android:ellipsize="marquee" /> <com.android.internal.widget.DigitalClock android:id="@+id/time" android:layout_width="wrap_content" diff --git a/core/res/res/layout/keyguard_screen_unlock_portrait.xml b/core/res/res/layout/keyguard_screen_unlock_portrait.xml index ac6cf19..eb150f5 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -41,6 +41,9 @@ android:layout_marginTop="6dip" android:layout_alignParentRight="true" android:layout_marginRight="8dip" + android:layout_toRightOf="@+id/time" + android:singleLine="true" + android:ellipsize="marquee" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -93,7 +96,7 @@ android:layout_marginLeft="24dip" android:textAppearance="?android:attr/textAppearanceMedium" /> - + </RelativeLayout> <View |