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

Commit a9bd1499 authored by Alex Johnston's avatar Alex Johnston Committed by Android (Google) Code Review
Browse files

Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev

parents b751a12a 6faed3c6

res/layout-land/confirm_lock_password.xml

+35 −69
Original line number Diff line number Diff line
@@ -18,34 +18,15 @@ 
    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_enterprise"

    android:layout="@layout/sud_glif_blank_template">

    android:icon="@drawable/ic_enterprise">



    <!--common_typos_disable-->

    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"

        android:orientation="horizontal"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">



            <ImageView

                android:id="@+id/sud_layout_icon"

                style="@style/SudGlifIcon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="?attr/sudGlifHeaderGravity"

                android:src="@drawable/ic_enterprise" />



            <TextView

                android:id="@+id/headerText"

                style="@style/SudGlifHeaderTitle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content" />

        android:layout_height="match_parent"

        android:layout_weight="1">



        <TextView

            android:id="@+id/sud_layout_description"
@@ -64,24 +45,12 @@ 
            android:layout_marginEnd="?attr/sudMarginSides"

            android:layout_gravity="center"

            android:visibility="gone" />

        </LinearLayout>



        <Space

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_horizontal"

            android:orientation="vertical">



        <com.android.settings.widget.ScrollToParentEditText

            android:id="@+id/password_entry"

            android:layout_width="208dp"

            android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

            android:layout_gravity="center"

            android:inputType="textPassword"

            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

            android:gravity="center"
@@ -91,13 +60,10 @@ 
            style="@style/TextAppearance.ErrorText"

            android:accessibilityLiveRegion="polite"

            android:id="@+id/errorText"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

                android:layout_marginTop="8dp"

                android:layout_marginStart="12dp"

                android:layout_marginEnd="12dp"/>



        </LinearLayout>

            android:layout_marginTop="8dp"/>



        <Space

            android:layout_width="match_parent"