Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair

Browse Source 
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This commit is contained in:
Jim Miller
2010-01-22 20:23:37 -08:00
committed by Android Git Automerger
parent 99988b6ee6 2e4e25f39e
commit 33ca1f3218
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
View File

@@ -26,8 +26,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
>
android:orientation="vertical">
<!-- header text ('Enter Pin Code') -->
<TextView android:id="@+id/headerText"
@@ -35,9 +34,20 @@
android:layout_height="wrap_content"
android:layout_marginTop="9dip"
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"
/>
<RelativeLayout
android:layout_width="fill_parent"

6
core/res/res/layout/keyguard_screen_tab_unlock.xml
View File

@@ -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"
/>
@@ -127,7 +129,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="80dip"
android:layout_marginBottom="80dip"
/>
<!-- emergency call button shown when sim is missing or PUKd -->

4
core/res/res/layout/keyguard_screen_tab_unlock_land.xml
View File

@@ -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"
/>

2
core/res/res/layout/keyguard_screen_unlock_landscape.xml
View File

@@ -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"

5
core/res/res/layout/keyguard_screen_unlock_portrait.xml
View File

@@ -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"
/>
@@ -91,7 +94,7 @@
android:layout_marginLeft="24dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
</RelativeLayout>
<View