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

Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165

Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chang
2023-07-10 03:41:17 +00:00
committed by Automerger Merge Worker
parent d148a02796 5a0d4d1cc3
commit 17d1e70930
12 changed files with 112 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout-land/choose_lock_pattern_common.xml
View File

@@ -38,15 +38,6 @@
android:paddingRight="0dp"
android:paddingBottom="0dp">
<!-- TODO b/249974175 Move into Glif header mixin -->
<Button
android:id="@+id/screen_lock_options"
style="@style/SudGlifButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"
android:visibility="gone"/>
<com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="wrap_content"

14
res/layout/choose_lock_password.xml
View File

@@ -61,12 +61,6 @@
android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
style="@style/TextAppearance.PasswordEntry"/>
<androidx.recyclerview.widget.RecyclerView
android:layout_marginTop="8dp"
android:id="@+id/password_requirements_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<CheckBox
android:id="@+id/auto_pin_confirm_enabler"
android:layout_marginTop="8dp"
@@ -91,14 +85,6 @@
android:textSize="16sp"
android:visibility="gone" />
<Button
android:id="@+id/screen_lock_options"
style="@style/SudGlifButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"
android:visibility="gone" />
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

8
res/layout/choose_lock_pattern_common.xml
View File

@@ -36,14 +36,6 @@
android:paddingLeft="0dp"
android:paddingRight="0dp">
<Button
android:id="@+id/screen_lock_options"
style="@style/LockPatternButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"
android:visibility="gone"/>
<com.google.android.setupdesign.view.FillContentLayout
style="@style/LockPatternContainerStyle"
android:layout_width="wrap_content"

9
res/values/dimens.xml
View File

@@ -229,6 +229,15 @@
<!-- Minimum height for setting a lock pattern -->
<dimen name="choose_lockscreen_min_height">200dp</dimen>
<!-- Choose lock Password requirement dimensions -->
<dimen name="password_requirement_view_margin_top">16dp</dimen>
<!-- Screen lock option button dimensions -->
<dimen name="screen_lock_options_button_margin_top">32dp</dimen>
<!-- Choose lock Password requirement font size -->
<dimen name="password_requirement_font_size">16sp</dimen>
<!-- Select dialog -->
<dimen name="select_dialog_padding_start">20dp</dimen>
<dimen name="select_dialog_item_margin_start">12dp</dimen>

4
res/values/ids.xml
View File

@@ -40,4 +40,8 @@
<!-- For a layout container to add AppLocaleDetails into -->
<item type="id" name="layout_app_locale_details" />
<!-- For screen lock options button -->
<item type="id" name="screen_lock_options" />
</resources>

6
res/values/styles.xml
View File

@@ -947,4 +947,10 @@
<item name="biometricsEnrollProgressHelp">@color/udfps_enroll_progress_help</item>
<item name="biometricsEnrollProgressHelpWithTalkback">@color/udfps_enroll_progress_help_with_talkback</item>
</style>
<style name="ScreenLockPasswordHintTextFontStyle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-text</item>
</style>
</resources>