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

Commit 0ceb2d69 authored by Maurice Lam's avatar Maurice Lam
Browse files

Fix truncated text in pattern lock setup 

Partially apply ag/708412 to the setup version of the layout. The
rest is not necessary because we assign a weight to the lock pattern
view as well.

Use the short header layout for screens smaller than sw360dp so that
there is more space for the pattern view.

Bug: 28663249
Change-Id: I8cda13834504a345046bc3bf6e0959d613597916
parent 27288746

res/layout/setup_choose_lock_pattern_common.xml

+5 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout="@layout/setup_choose_lock_pattern_template"

    settings:suwBackgroundTile="@drawable/setup_illustration_tile"

    settings:suwHeaderText="@string/wifi_setup_wizard_title"

    settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
@@ -43,10 +44,10 @@ 


            <TextView android:id="@+id/headerText"

                android:layout_width="match_parent"

                android:layout_height="0dip"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:minLines="2"

                android:gravity="center"

                android:minHeight="50dip"

                android:textSize="18sp" />



            <Button android:id="@+id/retryButton"
@@ -59,8 +60,7 @@ 
            <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"

                android:layout_width="match_parent"

                android:layout_height="0dip"

                android:layout_weight="4"

                android:background="@color/lock_pattern_background"/>

                android:layout_weight="4" />



        </LinearLayout>

res/values-sw360dp/aliases.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<resources>

     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template</item>

</resources>

res/values/aliases.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,5 +23,6 @@ 
     <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>

     <item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item>

     <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>

     <item name="setup_choose_lock_pattern_template" type="layout">@layout/suw_template_short</item>

</resources>