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

Commit 76803d55 authored by Jim Miller's avatar Jim Miller
Browse files

Fix 5044158: Fix landscape PIN layout issue 

This allows the PIN keyboard to settle to the bottom of the
view and the password textfield to fill the remaining space by
using the new rowOrderPreserved flag on GridLayout.

Change-Id: I8cf8cc383dfb1d6a2a7adbb78a8026fd54628ae0
parent e3373ff6

core/res/res/layout/keyguard_screen_password_landscape.xml

+32 −21
Original line number Original line Diff line number Diff line
@@ -24,15 +24,17 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:orientation="vertical"

    android:rowCount="7"

    android:rowCount="8"

    android:id="@+id/root"

    android:id="@+id/root"

    android:clipChildren="false">

    android:clipChildren="false"

    android:rowOrderPreserved="false">





    <!-- Column 0 -->

    <!-- Column 0 -->

    <com.android.internal.widget.DigitalClock android:id="@+id/time"

    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_marginTop="8dip"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_marginBottom="8dip"

        android:layout_gravity="right">

        android:layout_gravity="right"

        android:layout_rowSpan="2">





       <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

       <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->

        top of the other. Hence the redundant layout... -->
@@ -118,13 +120,20 @@ 
    />

    />





    <!-- Column 1 -->

    <!-- Column 1 -->

    <Space android:layout_width="16dip" android:layout_rowSpan="7" />

    <Space

        android:layout_width="16dip"

        android:layout_rowSpan="8"

        android:layout_gravity="fill_vertical" />





    <!-- Column 2 - password entry field and PIN keyboard -->

    <!-- Column 2 - password entry field and PIN keyboard -->

    <LinearLayout

        android:orientation="vertical"

        android:layout_width="270dip"

        android:layout_gravity="center_vertical">



        <EditText android:id="@+id/passwordEntry"

        <EditText android:id="@+id/passwordEntry"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

        android:layout_width="wrap_content"

            android:layout_width="match_parent"

        android:layout_gravity="fill"

            android:gravity="center"

            android:gravity="center"

            android:singleLine="true"

            android:singleLine="true"

            android:textStyle="normal"

            android:textStyle="normal"
@@ -137,6 +146,8 @@ 
            android:imeOptions="flagNoFullscreen|actionDone"

            android:imeOptions="flagNoFullscreen|actionDone"

            />

            />





    </LinearLayout>



    <!-- Numeric keyboard -->

    <!-- Numeric keyboard -->

    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

        android:layout_width="270dip"

        android:layout_width="270dip"
@@ -146,7 +157,7 @@ 
        android:layout_marginTop="5dip"

        android:layout_marginTop="5dip"

        android:keyBackground="@*android:drawable/btn_keyboard_key_ics"

        android:keyBackground="@*android:drawable/btn_keyboard_key_ics"

        android:visibility="gone"

        android:visibility="gone"

        android:layout_rowSpan="6"

        android:layout_rowSpan="7"

    />

    />





    <!-- Music transport control -->

    <!-- Music transport control -->
@@ -154,7 +165,7 @@ 
        layout="@layout/keyguard_transport_control"

        layout="@layout/keyguard_transport_control"

        android:layout_row="0"

        android:layout_row="0"

        android:layout_column="0"

        android:layout_column="0"

        android:layout_rowSpan="5"

        android:layout_rowSpan="6"

        android:layout_columnSpan="1"

        android:layout_columnSpan="1"

        android:layout_gravity="fill"

        android:layout_gravity="fill"

        />

        />