PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev am: a9bd149983 am: 5ccaa7e741 am: f44f0fba0e am: 059dafa336

Browse Source 
Change-Id: I31fc4c669470053b55f9023d40ffdf02545f5180
This commit is contained in:
Alex Johnston
2020-03-26 10:40:42 +00:00
committed by Automerger Merge Worker
parent 8242c7da1b 059dafa336
commit 99a1185744
1 changed files with 34 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
res/layout-land/confirm_lock_password.xml
View File

@@ -18,86 +18,52 @@
android:id="@+id/setup_wizard_layout" android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:icon="@drawable/ic_enterprise" android:icon="@drawable/ic_enterprise">
android:layout="@layout/sud_glif_blank_template">
<!--common_typos_disable--> <!--common_typos_disable-->
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout" android:id="@+id/topLayout"
android:orientation="horizontal" android:orientation="vertical"
android:layout_width="match_parent" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginStart="?attr/sudMarginSides"
android:layout_marginEnd="?attr/sudMarginSides" />
<ImageView <Button
android:id="@+id/sud_layout_icon" android:id="@+id/forgotButton"
style="@style/SudGlifIcon" style="@style/SudGlifButton.Secondary"
android:layout_width="wrap_content" 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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:layout_marginStart="?attr/sudMarginSides"
android:orientation="vertical"> android:layout_marginEnd="?attr/sudMarginSides"
android:layout_gravity="center"
android:visibility="gone" />
<com.android.settings.widget.ScrollToParentEditText <com.android.settings.widget.ScrollToParentEditText
android:id="@+id/password_entry" android:id="@+id/password_entry"
android:layout_width="208dp" android:layout_width="208dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii" android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center" android:gravity="center"
style="@style/TextAppearance.PasswordEntry"/> style="@style/TextAppearance.PasswordEntry"/>
<TextView <TextView
style="@style/TextAppearance.ErrorText" style="@style/TextAppearance.ErrorText"
android:accessibilityLiveRegion="polite" android:accessibilityLiveRegion="polite"
android:id="@+id/errorText" android:id="@+id/errorText"
android:layout_width="wrap_content" android:layout_gravity="center"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="8dp" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginTop="8dp"/>
android:layout_marginEnd="12dp"/>
</LinearLayout>
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"