Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f11a762 authored by Jim Miller's avatar Jim Miller Committed by The Android Open Source Project
Browse files

AI 145578: Tweak buttons in ChooseLockPatternTutorial to accomodate more text... 

AI 145578: Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
  BUG=1776037

Automated import of CL 145578
parent 9b0619e1

res/layout/choose_lock_pattern_example.xml

+10 −8
Original line number Diff line number Diff line
@@ -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"

res/layout/choose_lock_pattern_tutorial.xml

+10 −8
Original line number Diff line number Diff line
@@ -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"

        />