diff options
| author | The Android Automerger <android-build@android.com> | 2010-01-26 15:16:04 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2010-01-26 15:16:04 -0800 |
| commit | 1800fe985a27f7e2ed3c9fda9fc8ae3042901c0b (patch) | |
| tree | 83d64865f7b0c4dc9106aaeaa2d018e0db379881 | |
| parent | 48bb98b925fdd7e5dcae6b7a8c7bbb2fb4143f24 (diff) | |
| parent | 9985867a8eb80c6db84c80a9b5e96bd68e2d14d7 (diff) | |
| download | base-1800fe985a27f7e2ed3c9fda9fc8ae3042901c0b.tar.gz | |
Merge branch 'eclair' into eclair-release
5 files changed, 26 insertions, 10 deletions
diff --git a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml index 4c583d84eeb2..e75cf09db6aa 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_landscape.xml @@ -23,6 +23,28 @@ android:background="@android:color/background_dark" > + <!-- header text ('Enter Pin Code') --> + <TextView android:id="@+id/headerText" + android:layout_above="@+id/carrier" + android:layout_centerHorizontal="true" + android:layout_marginBottom="30dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="24sp" + /> + + <!-- Carrier info --> + <TextView android:id="@+id/carrier" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/pinDisplayGroup" + android:layout_marginTop="9dip" + android:gravity="left|bottom" + android:singleLine="true" + android:ellipsize="marquee" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + <!-- displays dots as user enters pin --> <LinearLayout android:id="@+id/pinDisplayGroup" android:orientation="horizontal" @@ -60,16 +82,6 @@ </LinearLayout> - <!-- header text ('Enter Pin Code') --> - <TextView android:id="@+id/headerText" - android:layout_above="@id/pinDisplayGroup" - android:layout_centerHorizontal="true" - android:layout_marginBottom="30dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="24sp" - /> - <LinearLayout android:orientation="horizontal" android:layout_alignParentBottom="true" diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 853b992f61d4..9d574863fc41 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -39,6 +39,7 @@ android:layout_marginRight="8dip" android:singleLine="true" android:ellipsize="marquee" + android:gravity="right|bottom" android:textAppearance="?android:attr/textAppearanceMedium" /> 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 07839435ba02..27a29b1ee87d 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock_land.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock_land.xml @@ -44,6 +44,7 @@ android:layout_marginTop="20dip" android:singleLine="true" android:ellipsize="marquee" + android:gravity="right|bottom" 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 a5da3d0c552c..bca6241fd5e2 100644 --- a/core/res/res/layout/keyguard_screen_unlock_landscape.xml +++ b/core/res/res/layout/keyguard_screen_unlock_landscape.xml @@ -56,6 +56,7 @@ android:layout_marginTop="32dip" android:singleLine="true" android:ellipsize="marquee" + android:gravity="right|bottom" /> <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 a0c5423717a0..7c649ecd7d2c 100644 --- a/core/res/res/layout/keyguard_screen_unlock_portrait.xml +++ b/core/res/res/layout/keyguard_screen_unlock_portrait.xml @@ -44,6 +44,7 @@ android:layout_toRightOf="@+id/time" android:singleLine="true" android:ellipsize="marquee" + android:gravity="right|bottom" android:textAppearance="?android:attr/textAppearanceMedium" /> |