From fbed9b87ce3ef22a373d915eacf45b930f4ddab5 Mon Sep 17 00:00:00 2001 From: lbill Date: Mon, 14 Nov 2022 19:11:48 +0000 Subject: [PATCH] 3/ SUW lib Glif and theme add additional padding in sud_layout_content Temporary remove the redundant padding from ChooseLockPattern and ConfirmLockPattern as a workaround solution. Bug: 243008023 Test: make and check visual on foldable Test: make RunSettingsRoboTests Change-Id: I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad Merged-In: I0baa2be65b797ca70f9de43bc8c5e3187a2d28ad --- src/com/android/settings/password/ChooseLockPattern.java | 5 +++++ src/com/android/settings/password/ConfirmLockPattern.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index c39ef661a0f..07c533f4638 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -215,6 +215,7 @@ public class ChooseLockPattern extends SettingsActivity { private FooterButton mNextButton; @VisibleForTesting protected LockscreenCredential mChosenPattern; private ColorStateList mDefaultHeaderColorList; + private View mSudContent; /** * The patten used during the help screen to show how to draw a pattern. @@ -537,6 +538,10 @@ public class ChooseLockPattern extends SettingsActivity { ); mSkipOrClearButton = mixin.getSecondaryButton(); mNextButton = mixin.getPrimaryButton(); + // TODO(b/243008023) Workaround for Glif layout on 2 panel choose lock settings. + mSudContent = layout.findViewById(R.id.sud_layout_content); + mSudContent.setPadding(mSudContent.getPaddingLeft(), 0, mSudContent.getPaddingRight(), + 0); return layout; } diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index 1062d940ea7..b4f0aa3d068 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/src/com/android/settings/password/ConfirmLockPattern.java @@ -100,6 +100,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { private CountDownTimer mCountdownTimer; private GlifLayout mGlifLayout; + private View mSudContent; // caller-supplied text for various prompts private CharSequence mHeaderText; @@ -129,7 +130,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { mGlifLayout = view.findViewById(R.id.setup_wizard_layout); mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern); mErrorTextView = (TextView) view.findViewById(R.id.errorText); - + // TODO(b/243008023) Workaround for Glif layout on 2 panel choose lock settings. + mSudContent = mGlifLayout.findViewById(R.id.sud_layout_content); + mSudContent.setPadding(mSudContent.getPaddingLeft(), 0, mSudContent.getPaddingRight(), + 0); mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId); // make it so unhandled touch events within the unlock screen go to the