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

3/ SUW lib Glif and theme add additional padding in sud_layout_content

Browse Source 
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
This commit is contained in:
lbill
2022-11-14 19:11:48 +00:00
committed by Bill Lin
parent 932874130e
commit c2bfb4fbf3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -215,6 +215,7 @@ public class ChooseLockPattern extends SettingsActivity {
private FooterButton mNextButton; private FooterButton mNextButton;
@VisibleForTesting protected LockscreenCredential mChosenPattern; @VisibleForTesting protected LockscreenCredential mChosenPattern;
private ColorStateList mDefaultHeaderColorList; private ColorStateList mDefaultHeaderColorList;
private View mSudContent;
/** /**
* The patten used during the help screen to show how to draw a pattern. * 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(); mSkipOrClearButton = mixin.getSecondaryButton();
mNextButton = mixin.getPrimaryButton(); 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; return layout;
} }

6
src/com/android/settings/password/ConfirmLockPattern.java
View File

@@ -100,6 +100,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
private CountDownTimer mCountdownTimer; private CountDownTimer mCountdownTimer;
private GlifLayout mGlifLayout; private GlifLayout mGlifLayout;
private View mSudContent;
// caller-supplied text for various prompts // caller-supplied text for various prompts
private CharSequence mHeaderText; private CharSequence mHeaderText;
@@ -129,7 +130,10 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
mGlifLayout = view.findViewById(R.id.setup_wizard_layout); mGlifLayout = view.findViewById(R.id.setup_wizard_layout);
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern); mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mErrorTextView = (TextView) view.findViewById(R.id.errorText); 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); mIsManagedProfile = UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId);
// make it so unhandled touch events within the unlock screen go to the // make it so unhandled touch events within the unlock screen go to the