Skip to content

Commit

Permalink
Fix keyboard overlap in work challenge landscape view
Browse files Browse the repository at this point in the history 
* Remove layout sud_glif_blank_template and add layout
  weight in land/confirm_lock_password.xml.

Bug: 152054458
Test: manual testing
Change-Id: I8d4329b141e1fe24d5b8d66e8e7971fe951d6af2
  • Loading branch information
Alex Johnston committed Mar 25, 2020
1 parent cdaf5d3 commit 6faed3c
Showing 1 changed file with 35 additions and 69 deletions.
104 changes: 35 additions & 69 deletions res/layout-land/confirm_lock_password.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,86 +18,52 @@
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">
android:layout_height="match_parent"
android:layout_weight="1">

<LinearLayout
<TextView
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
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" />

<TextView
android:id="@+id/sud_layout_description"
style="@style/SudDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides" />

<Button
android:id="@+id/forgotButton"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginSides"
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" />
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides" />

<LinearLayout
android:layout_width="match_parent"
<Button
android:id="@+id/forgotButton"
style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content"
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:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center"
style="@style/TextAppearance.PasswordEntry"/>

<TextView
style="@style/TextAppearance.ErrorText"
android:accessibilityLiveRegion="polite"
android:id="@+id/errorText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"/>
android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides"
android:layout_gravity="center"
android:visibility="gone" />

</LinearLayout>
<com.android.settings.widget.ScrollToParentEditText
android:id="@+id/password_entry"
android:layout_width="208dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center"
style="@style/TextAppearance.PasswordEntry"/>

<TextView
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"/>

<Space
android:layout_width="match_parent"
Expand Down

0 comments on commit 6faed3c

Please sign in to comment.