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

Commit 89ac835d authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Prevent scrolling when interacting with confirm pattern prompt." into...

Merge "Prevent scrolling when interacting with confirm pattern prompt." into sc-v2-dev am: 710622d8

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

Change-Id: I2390634fede31fa796d4130f22e8cc3bd0da5ff9
parents ed0b68a7 710622d8
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.settings.password;

import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Intent;
@@ -28,6 +29,7 @@ import android.os.UserManager;
import android.os.storage.StorageManager;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AnimationUtils;
@@ -108,6 +110,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {

        }

        @SuppressLint("ClickableViewAccessibility")
        @Override
        public View onCreateView(LayoutInflater inflater, ViewGroup container,
                Bundle savedInstanceState) {
@@ -146,6 +149,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
            mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(
                    mEffectiveUserId));
            mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
            mLockPatternView.setOnTouchListener((v, event) -> {
                if (event.getAction() == MotionEvent.ACTION_DOWN) {
                    v.getParent().requestDisallowInterceptTouchEvent(true);
                }
                return false;
            });
            updateStage(Stage.NeedToUnlock);

            if (savedInstanceState == null) {