Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81974ace authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge changes from topic "pattern-view-size" into tm-qpr-dev am: 3959e27e 

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



Change-Id: I69f420a942336d1fb589793662d1e700fa64b173
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e148d71 3959e27e

src/com/android/settings/password/ChooseLockPattern.java

+5 −0
Original line number Diff line number Diff line
@@ -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;

        }

src/com/android/settings/password/ConfirmLockPattern.java

+5 −1
Original line number Diff line number Diff line
@@ -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