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

Commit 5a0c8ead authored by Josep del Rio's avatar Josep del Rio
Browse files

Fix shade external keyboard user activity handling 

The original fix for the keyguard user activity when using an
external keyboard did not resolve all the cases; this CL moves
this logic to an earlier phase of event processing.

Bug: 325932166
Test: Verified on device
Flag: NONE
Change-Id: I1b599dafd1a39cfac3d1d9660b0bc2ca0a90ee80
parent b7834aa2

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ constructor( 
     * exit bouncer.

     */

    fun dispatchKeyEventPreIme(event: KeyEvent): Boolean {

        when (event.action) {

            KeyEvent.ACTION_DOWN -> {

                val device = event.getDevice()

                if (device != null && device.isFullKeyboard() && device.isExternal()) {

                    powerInteractor.onUserTouch()

                }

            }

        }

        when (event.keyCode) {

            KeyEvent.KEYCODE_BACK ->

                if (

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+0 −24
Original line number Diff line number Diff line
@@ -69,8 +69,6 @@ import android.util.IndentingPrintWriter; 
import android.util.Log;

import android.util.MathUtils;

import android.view.HapticFeedbackConstants;

import android.view.InputDevice;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.MotionEvent;

import android.view.VelocityTracker;
@@ -358,7 +356,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
    private final QuickSettingsControllerImpl mQsController;

    private final NaturalScrollingSettingObserver mNaturalScrollingSettingObserver;

    private final TouchHandler mTouchHandler = new TouchHandler();

    private final KeyHandler mKeyHandler = new KeyHandler();



    private long mDownTime;

    private boolean mTouchSlopExceededBeforeDown;
@@ -820,7 +817,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 


        mView.addOnLayoutChangeListener(new ShadeLayoutChangeListener());

        mView.setOnTouchListener(getTouchHandler());

        mView.setOnKeyListener(getKeyHandler());

        mView.setOnConfigurationChangedListener(config -> loadDimens());



        mResources = mView.getResources();
@@ -3592,11 +3588,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return mTouchHandler;

    }



    @VisibleForTesting

    KeyHandler getKeyHandler() {

        return mKeyHandler;

    }



    @Override

    public void disableHeader(int state1, int state2, boolean animated) {

        mShadeHeaderController.disable(state1, state2, animated);
@@ -5256,21 +5247,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        }

    }



    /** Handles KeyEvents for the Shade. */

    public final class KeyHandler implements View.OnKeyListener {

        @Override

        public boolean onKey(View v, int keyCode, KeyEvent event) {

            if (event.getAction() == KeyEvent.ACTION_DOWN) {

                final InputDevice d = event.getDevice();

                // Trigger user activity if the event comes from a full external keyboard

                if (d != null && d.isFullKeyboard() && d.isExternal()) {

                    mCentralSurfaces.userActivity();

                }

            }

            return false;

        }

    }



    private final class HeadsUpNotificationViewControllerImpl implements

            HeadsUpTouchHelper.HeadsUpNotificationViewController {

        @Override