PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 146013: am: CL 145861 am: CL 145578 Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.

Browse Source 
Original author: jaggies
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146013
This commit is contained in:
Jim Miller
2009-04-13 17:00:16 -07:00
committed by The Android Open Source Project
parent dc8807a9c2
commit bdcc4e69ff
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/choose_lock_pattern_example.xml
View File

@@ -67,22 +67,24 @@
<Button android:id="@+id/skip_button" <Button android:id="@+id/skip_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1" android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/skip_button_label" android:text="@string/skip_button_label"
/> />
<!-- Placeholder to get blank space between the two buttons -->
<View <View
android:visibility="invisible" android:visibility="invisible"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_width="0dip" android:layout_width="1dip"
android:layout_weight="1" android:layout_weight="1" />
/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1" android:ellipsize="marquee"
android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next" android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip" android:drawablePadding="3dip"
android:text="@string/next_button_label" android:text="@string/next_button_label"

16
res/layout/choose_lock_pattern_tutorial.xml
View File

@@ -59,24 +59,26 @@
<Button android:id="@+id/skip_button" <Button android:id="@+id/skip_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1" android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/skip_button_label" android:text="@string/skip_button_label"
/> />
<!-- Placeholder to get blank space between the two buttons -->
<View <View
android:visibility="invisible" android:visibility="invisible"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_width="0dip" android:layout_width="1dip"
android:layout_weight="1" android:layout_weight="1" />
/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dip" android:layout_width="140dip"
android:layout_weight="1"
android:drawableRight="@drawable/ic_btn_next" android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="3dip" android:drawablePadding="3dip"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/next_button_label" android:text="@string/next_button_label"
/> />