Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.

This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.

5 files changed, 27 insertions, 8 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 45e96a3b4624..c9a9d5d3faed 100644
--- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
+++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml
@@ -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"
diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml
index f8944b5ca868..853b992f61d4 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"
         />
 
@@ -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 -->
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 22c0b8e2066f..07839435ba02 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 602a37ca9621..a5da3d0c552c 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 9ce5a250de95..a0c5423717a0 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"
             />
 
@@ -91,7 +94,7 @@
             android:layout_marginLeft="24dip"
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
-    
+
     </RelativeLayout>
 
     <View