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

Commit ec616984 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make min longpress lock icon time configurable" into tm-d1-dev am: 82886590 am: 6eaadeaa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18740077



Change-Id: I173b745714094abfd1cb1bfda526c2b10dc52d2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89234683 6eaadeaa

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -583,6 +583,9 @@ 
        280

    </integer>



    <!-- The time (in ms) needed to trigger the lock icon view's long-press affordance -->

    <integer name="config_lockIconLongPress" translatable="false">200</integer>



    <!-- package name of a built-in camera app to use to restrict implicit intent resolution

         when the double-press power gesture is used. Ignored if empty. -->

    <string translatable="false" name="config_cameraGesturePackage"></string>

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java

+5 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
    private static final int sLockIconRadiusPx = (int) (sDefaultDensity * 36);

    private static final VibrationAttributes TOUCH_VIBRATION_ATTRIBUTES =

            VibrationAttributes.createForUsage(VibrationAttributes.USAGE_TOUCH);

    private static final long LONG_PRESS_TIMEOUT = 200L; // milliseconds



    private final long mLongPressTimeout;

    @NonNull private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @NonNull private final KeyguardViewController mKeyguardViewController;

    @NonNull private final StatusBarStateController mStatusBarStateController;
@@ -176,6 +176,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
        mView.setImageDrawable(mIcon);

        mUnlockedLabel = resources.getString(R.string.accessibility_unlock_button);

        mLockedLabel = resources.getString(R.string.accessibility_lock_icon);

        mLongPressTimeout = resources.getInteger(R.integer.config_lockIconLongPress);

        dumpManager.registerDumpable(TAG, this);

    }
@@ -545,7 +546,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
    /**

     * Handles the touch if it is within the lock icon view and {@link #isActionable()} is true.

     * Subsequently, will trigger {@link #onLongPress()} if a touch is continuously in the lock icon

     * area for {@link #LONG_PRESS_TIMEOUT} ms.

     * area for {@link #mLongPressTimeout} ms.

     *

     * Touch speed debouncing mimics logic from the velocity tracker in {@link UdfpsController}.

     */
@@ -585,7 +586,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 


                mDownDetected = true;

                mLongPressCancelRunnable = mExecutor.executeDelayed(

                        this::onLongPress, LONG_PRESS_TIMEOUT);

                        this::onLongPress, mLongPressTimeout);

                break;

            case MotionEvent.ACTION_MOVE:

            case MotionEvent.ACTION_HOVER_MOVE:
@@ -600,7 +601,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme 
                            + "high pointer velocity=" + velocity);

                    mLongPressCancelRunnable.run();

                    mLongPressCancelRunnable = mExecutor.executeDelayed(

                            this::onLongPress, LONG_PRESS_TIMEOUT);

                            this::onLongPress, mLongPressTimeout);

                }

                break;

            case MotionEvent.ACTION_UP: