AI 146013: am: CL 145861 am: CL 145578 Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
Original author: jaggies Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146013
This commit is contained in:

committed by
The Android Open Source Project
parent
dc8807a9c2
commit
bdcc4e69ff
@@ -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"
|
||||
|
@@ -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"
|
||||
/>
|
||||
|
||||
|
Reference in New Issue
Block a user