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

Commit bb20ba64 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Make the notif panel focusable during screen off so touch events don't... 

Merge "Make the notif panel focusable during screen off so touch events don't go to the app behind." into sc-dev am: ce9883b6 am: 6810a423

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

Change-Id: Ib94bc21cf23a2ba2626a1691e26c751f349b223c
parents 32327e7e 6810a423

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java

+9 −2
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            mCallbacks = Lists.newArrayList();



    private final SysuiColorExtractor mColorExtractor;

    private final UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    private float mFaceAuthDisplayBrightness = LayoutParams.BRIGHTNESS_OVERRIDE_NONE;



    @Inject
@@ -110,7 +111,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            KeyguardBypassController keyguardBypassController,

            SysuiColorExtractor colorExtractor,

            DumpManager dumpManager,

            KeyguardStateController keyguardStateController) {

            KeyguardStateController keyguardStateController,

            UnlockedScreenOffAnimationController unlockedScreenOffAnimationController) {

        mContext = context;

        mWindowManager = windowManager;

        mActivityManager = activityManager;
@@ -121,6 +123,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
        mKeyguardViewMediator = keyguardViewMediator;

        mKeyguardBypassController = keyguardBypassController;

        mColorExtractor = colorExtractor;

        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        dumpManager.registerDumpable(getClass().getName(), this);



        mLockScreenDisplayTimeout = context.getResources()
@@ -300,7 +303,11 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
    private void applyFocusableFlag(State state) {

        boolean panelFocusable = state.mNotificationShadeFocusable && state.mPanelExpanded;

        if (state.mBouncerShowing && (state.mKeyguardOccluded || state.mKeyguardNeedsInput)

                || ENABLE_REMOTE_INPUT && state.mRemoteInputActive) {

                || ENABLE_REMOTE_INPUT && state.mRemoteInputActive

                // Make the panel focusable if we're doing the screen off animation, since the light

                // reveal scrim is drawing in the panel and should consume touch events so that they

                // don't go to the app behind.

                || mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {

            mLpChanged.flags &= ~LayoutParams.FLAG_NOT_FOCUSABLE;

            mLpChanged.flags &= ~LayoutParams.FLAG_ALT_FOCUSABLE_IM;

        } else if (state.isKeyguardShowingAndNotOccluded() || panelFocusable) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java

+3 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
    @Mock ColorExtractor.GradientColors mGradientColors;

    @Mock private DumpManager mDumpManager;

    @Mock private KeyguardStateController mKeyguardStateController;

    @Mock private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;

    @Captor private ArgumentCaptor<WindowManager.LayoutParams> mLayoutParameters;



    private NotificationShadeWindowControllerImpl mNotificationShadeWindowController;
@@ -85,7 +86,8 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { 
        mNotificationShadeWindowController = new NotificationShadeWindowControllerImpl(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mColorExtractor, mDumpManager, mKeyguardStateController);

                mColorExtractor, mDumpManager, mKeyguardStateController,

                mUnlockedScreenOffAnimationController);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);



        mNotificationShadeWindowController.attach();

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+5 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.NotificationShadeWindowControllerImpl;

import com.android.systemui.statusbar.phone.NotificationShadeWindowView;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -234,6 +235,8 @@ public class BubblesTest extends SysuiTestCase { 
    private ShellTaskOrganizer mShellTaskOrganizer;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;



    private TestableBubblePositioner mPositioner;
@@ -256,7 +259,8 @@ public class BubblesTest extends SysuiTestCase { 
        mNotificationShadeWindowController = new NotificationShadeWindowControllerImpl(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mColorExtractor, mDumpManager, mKeyguardStateController);

                mColorExtractor, mDumpManager, mKeyguardStateController,

                mUnlockedScreenOffAnimationController);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.attach();

packages/SystemUI/tests/src/com/android/systemui/wmshell/NewNotifPipelineBubblesTest.java

+5 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.NotificationShadeWindowControllerImpl;

import com.android.systemui.statusbar.phone.NotificationShadeWindowView;

import com.android.systemui.statusbar.phone.ShadeController;

import com.android.systemui.statusbar.phone.UnlockedScreenOffAnimationController;

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.HeadsUpManager;
@@ -198,6 +199,8 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { 
    private ShellTaskOrganizer mShellTaskOrganizer;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    @Mock

    private UnlockedScreenOffAnimationController mUnlockedScreenOffAnimationController;



    private TestableBubblePositioner mPositioner;
@@ -219,7 +222,8 @@ public class NewNotifPipelineBubblesTest extends SysuiTestCase { 
        mNotificationShadeWindowController = new NotificationShadeWindowControllerImpl(mContext,

                mWindowManager, mActivityManager, mDozeParameters, mStatusBarStateController,

                mConfigurationController, mKeyguardViewMediator, mKeyguardBypassController,

                mColorExtractor, mDumpManager, mKeyguardStateController);

                mColorExtractor, mDumpManager, mKeyguardStateController,

                mUnlockedScreenOffAnimationController);

        mNotificationShadeWindowController.setNotificationShadeView(mNotificationShadeWindowView);

        mNotificationShadeWindowController.attach();