From 0f11a7626c0857db78f71c5f8d2073481a400061 Mon Sep 17 00:00:00 2001
From: Jim Miller <>
Date: Thu, 9 Apr 2009 17:26:27 -0700
Subject: [PATCH] AI 145578: Tweak buttons in ChooseLockPatternTutorial to
 accomodate more text and marquee if necessary.   BUG=1776037

Automated import of CL 145578
---
 res/layout/choose_lock_pattern_example.xml  | 18 ++++++++++--------
 res/layout/choose_lock_pattern_tutorial.xml | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/res/layout/choose_lock_pattern_example.xml b/res/layout/choose_lock_pattern_example.xml
index b2d32e679d2..d1e816c831b 100644
--- a/res/layout/choose_lock_pattern_example.xml
+++ b/res/layout/choose_lock_pattern_example.xml
@@ -67,22 +67,24 @@
         
         <Button android:id="@+id/skip_button"
             android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="140dip"
+            android:ellipsize="marquee"
+            android:singleLine="true"
             android:text="@string/skip_button_label"
         />
       
+        <!-- Placeholder to get blank space between the two buttons -->
         <View
             android:visibility="invisible"
             android:layout_height="0dip"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-        />
-
+            android:layout_width="1dip"
+            android:layout_weight="1" />
+            
         <Button android:id="@+id/next_button"
             android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="140dip"
+            android:ellipsize="marquee"
+            android:singleLine="true"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
             android:text="@string/next_button_label"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 47af50b368a..8eadc01ce10 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -59,24 +59,26 @@
 
         <Button android:id="@+id/skip_button"
             android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="140dip"
+            android:ellipsize="marquee"
+            android:singleLine="true"
             android:text="@string/skip_button_label"
         />
         
+        <!-- Placeholder to get blank space between the two buttons -->
         <View
             android:visibility="invisible"
             android:layout_height="0dip"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-        />
-
+            android:layout_width="1dip"
+            android:layout_weight="1" />
+        
         <Button android:id="@+id/next_button"
             android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="1"
+            android:layout_width="140dip"
             android:drawableRight="@drawable/ic_btn_next"
             android:drawablePadding="3dip"
+            android:ellipsize="marquee"
+            android:singleLine="true"
             android:text="@string/next_button_label"
         />