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

Commit 3821c4c2 authored by Justin Weir's avatar Justin Weir
Browse files

Delete NPVC.onStatusBarWindowStateChanged 

This code originated in 2013 to fix b/8682123. It's use case is now
covered by other things like ActivityStarter, so this code is no longer
necessary and causing problems for other components.

Fixes: 351838854
Flag: EXEMPT bug fix
Test: Opened the shade, started camera app with power button, revealed status bar
Change-Id: Ia7cb5c6eaa5499d88966b4d344a151fe5c234dce
parent 192af059

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

+0 −15
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.shade;



import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;
@@ -57,7 +56,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.StatusBarManager;

import android.content.ContentResolver;

import android.content.res.Resources;

import android.database.ContentObserver;
@@ -233,7 +231,6 @@ import com.android.systemui.statusbar.policy.KeyguardUserSwitcherController; 
import com.android.systemui.statusbar.policy.KeyguardUserSwitcherView;

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

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

import com.android.systemui.statusbar.window.StatusBarWindowStateController;

import com.android.systemui.unfold.SysUIUnfoldComponent;

import com.android.systemui.util.Compile;

import com.android.systemui.util.Utils;
@@ -705,7 +702,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
            FalsingCollector falsingCollector,

            KeyguardStateController keyguardStateController,

            StatusBarStateController statusBarStateController,

            StatusBarWindowStateController statusBarWindowStateController,

            NotificationShadeWindowController notificationShadeWindowController,

            DozeLog dozeLog,

            DozeParameters dozeParameters,
@@ -913,7 +909,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        mMediaDataManager = mediaDataManager;

        mTapAgainViewController = tapAgainViewController;

        mSysUiState = sysUiState;

        statusBarWindowStateController.addListener(this::onStatusBarWindowStateChanged);

        mKeyguardBypassController = bypassController;

        mUpdateMonitor = keyguardUpdateMonitor;

        mLockscreenShadeTransitionController = lockscreenShadeTransitionController;
@@ -4882,16 +4877,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump 
        return mStatusBarStateListener;

    }



    private void onStatusBarWindowStateChanged(@StatusBarManager.WindowVisibleState int state) {

        if (state != WINDOW_STATE_SHOWING

                && mStatusBarStateController.getState() == StatusBarState.SHADE) {

            collapse(

                    false /* animate */,

                    false /* delayed */,

                    1.0f /* speedUpFactor */);

        }

    }



    /** Handles MotionEvents for the Shade. */

    public final class TouchHandler implements View.OnTouchListener, Gefingerpoken {

        private long mLastTouchDownTime = -1L;

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mFalsingManager, new FalsingCollectorFake(),

                mKeyguardStateController,

                mStatusBarStateController,

                mStatusBarWindowStateController,

                mNotificationShadeWindowController,

                mDozeLog, mDozeParameters, mCommandQueue, mVibratorHelper,

                mLatencyTracker, mAccessibilityManager, 0, mUpdateMonitor,