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

Commit 3cd44aee authored by Justin Weir's avatar Justin Weir
Browse files

Code cleanup pass on all of NPVC 

* Delete dead code
* Delete unnecessary code (e.g. 1 line methods called only once)
* Reduce API surface by reducing visibility wherever possible
* Remove unnecessary params that are always the same value
* Remove unnecessary returns that are always the same value
* Eliminate redundancies (e.g. multiple forms of debug logging)
* Make all member vars private
* Add bug ticket IDs to TODOs
* Shrink short 3 line comments to one line
* Convert single method inner classes to lambdas
* Consistent method naming (e.g. getFoo, isFoo, startFoo, onFoo)
* Move member vars declared in the middle of the class
* Move runnable declarations to the end of the init block
* Extract large methods declared inside other methods
* Make javadoc style more consistent
* Add 'final' wherever possible

I've done my best to reduce the negative impact on git blame,
and I think what remains is acceptable given the amount of churn
we expect this class to undergo in the coming months.

Bug: 237661616
Test: atest and manual
Change-Id: Ie0135b8b0d7dbc0263c616c9405001e3730336b7
parent 66fc5b3c

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

+339 −584

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ class LockscreenShadeTransitionController @Inject constructor( 
        } else {

            pulseHeight = height

            val overflow = nsslController.setPulseHeight(height)

            notificationPanelController.setOverStrechAmount(overflow)

            notificationPanelController.setOverStretchAmount(overflow)

            val transitionHeight = if (keyguardBypassController.bypassEnabled) height else 0.0f

            transitionToShadeAmountCommon(transitionHeight)

        }

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

+2 −5
Original line number Diff line number Diff line
@@ -3487,10 +3487,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mNavigationBarController.showPinningEscapeToast(mDisplayId);

    }



    /**

     * TODO: Remove this method. Views should not be passed forward. Will cause theme issues.

     * @return bottom area view

     */

    //TODO(b/254875405): this should be removed.

    @Override

    public KeyguardBottomAreaView getKeyguardBottomAreaView() {

        return mNotificationPanelViewController.getKeyguardBottomAreaView();
@@ -4203,7 +4200,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
     */

    @Override

    public void onBouncerPreHideAnimation() {

        mNotificationPanelViewController.onBouncerPreHideAnimation();

        mNotificationPanelViewController.startBouncerPreHideAnimation();



    }

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

+33 −39
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ import com.android.systemui.statusbar.QsFrameTranslateController; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.events.PrivacyDotViewController;

import com.android.systemui.statusbar.notification.ConversationNotificationManager;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;
@@ -153,7 +152,6 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController; 
import com.android.systemui.statusbar.phone.KeyguardStatusBarView;

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

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

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

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

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

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -199,7 +197,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Mock private KeyguardBottomAreaView mKeyguardBottomArea;

    @Mock private KeyguardBottomAreaViewController mKeyguardBottomAreaViewController;

    @Mock private KeyguardBottomAreaView mQsFrame;

    @Mock private NotificationIconAreaController mNotificationAreaController;

    @Mock private HeadsUpManagerPhone mHeadsUpManager;

    @Mock private NotificationShelfController mNotificationShelfController;

    @Mock private KeyguardStatusBarView mKeyguardStatusBar;
@@ -227,7 +224,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Mock private Resources mResources;

    @Mock private Configuration mConfiguration;

    @Mock private KeyguardClockSwitch mKeyguardClockSwitch;

    @Mock private MediaHierarchyManager mMediaHiearchyManager;

    @Mock private MediaHierarchyManager mMediaHierarchyManager;

    @Mock private ConversationNotificationManager mConversationNotificationManager;

    @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    @Mock private KeyguardStatusViewComponent.Factory mKeyguardStatusViewComponentFactory;
@@ -254,7 +251,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Mock private UiEventLogger mUiEventLogger;

    @Mock private LockIconViewController mLockIconViewController;

    @Mock private KeyguardMediaController mKeyguardMediaController;

    @Mock private PrivacyDotViewController mPrivacyDotViewController;

    @Mock private NavigationModeController mNavigationModeController;

    @Mock private NavigationBarController mNavigationBarController;

    @Mock private LargeScreenShadeHeaderController mLargeScreenShadeHeaderController;
@@ -294,7 +290,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    private ConfigurationController mConfigurationController;

    private SysuiStatusBarStateController mStatusBarStateController;

    private NotificationPanelViewController mNotificationPanelViewController;

    private View.AccessibilityDelegate mAccessibiltyDelegate;

    private View.AccessibilityDelegate mAccessibilityDelegate;

    private NotificationsQuickSettingsContainer mNotificationContainerParent;

    private List<View.OnAttachStateChangeListener> mOnAttachStateChangeListeners;

    private Handler mMainHandler;
@@ -456,7 +452,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                mShadeLog,

                mConfigurationController,

                () -> flingAnimationUtilsBuilder, mStatusBarTouchableRegionManager,

                mConversationNotificationManager, mMediaHiearchyManager,

                mConversationNotificationManager, mMediaHierarchyManager,

                mStatusBarKeyguardViewManager,

                mNotificationsQSContainerController,

                mNotificationStackScrollLayoutController,
@@ -465,7 +461,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                mKeyguardUserSwitcherComponentFactory,

                mKeyguardStatusBarViewComponentFactory,

                mLockscreenShadeTransitionController,

                mNotificationAreaController,

                mAuthController,

                mScrimController,

                mUserManager,
@@ -474,7 +469,6 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                mAmbientState,

                mLockIconViewController,

                mKeyguardMediaController,

                mPrivacyDotViewController,

                mTapAgainViewController,

                mNavigationModeController,

                mNavigationBarController,
@@ -516,9 +510,9 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        ArgumentCaptor<View.AccessibilityDelegate> accessibilityDelegateArgumentCaptor =

                ArgumentCaptor.forClass(View.AccessibilityDelegate.class);

        verify(mView).setAccessibilityDelegate(accessibilityDelegateArgumentCaptor.capture());

        mAccessibiltyDelegate = accessibilityDelegateArgumentCaptor.getValue();

        mAccessibilityDelegate = accessibilityDelegateArgumentCaptor.getValue();

        mNotificationPanelViewController.getStatusBarStateController()

                .addCallback(mNotificationPanelViewController.mStatusBarStateListener);

                .addCallback(mNotificationPanelViewController.getStatusBarStateListener());

        mNotificationPanelViewController

                .setHeadsUpAppearanceController(mock(HeadsUpAppearanceController.class));

        verify(mNotificationStackScrollLayoutController)
@@ -773,8 +767,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                0L /* eventTime */, MotionEvent.ACTION_UP, 0f /* x */, 300f /* y */,

                0 /* metaState */));



        assertThat(mNotificationPanelViewController.getClosing()).isTrue();

        assertThat(mNotificationPanelViewController.getIsFlinging()).isTrue();

        assertThat(mNotificationPanelViewController.isClosing()).isTrue();

        assertThat(mNotificationPanelViewController.isFlinging()).isTrue();



        // simulate touch that does not exceed touch slop

        onTouchEvent(MotionEvent.obtain(2L /* downTime */,
@@ -788,8 +782,8 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
                0 /* metaState */));



        // fling should still be called after a touch that does not exceed touch slop

        assertThat(mNotificationPanelViewController.getClosing()).isTrue();

        assertThat(mNotificationPanelViewController.getIsFlinging()).isTrue();

        assertThat(mNotificationPanelViewController.isClosing()).isTrue();

        assertThat(mNotificationPanelViewController.isFlinging()).isTrue();

    }



    @Test
@@ -844,7 +838,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void testA11y_initializeNode() {

        AccessibilityNodeInfo nodeInfo = new AccessibilityNodeInfo();

        mAccessibiltyDelegate.onInitializeAccessibilityNodeInfo(mView, nodeInfo);

        mAccessibilityDelegate.onInitializeAccessibilityNodeInfo(mView, nodeInfo);



        List<AccessibilityNodeInfo.AccessibilityAction> actionList = nodeInfo.getActionList();

        assertThat(actionList).containsAtLeastElementsIn(
@@ -856,7 +850,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void testA11y_scrollForward() {

        mAccessibiltyDelegate.performAccessibilityAction(

        mAccessibilityDelegate.performAccessibilityAction(

                mView,

                AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_FORWARD.getId(),

                null);
@@ -866,7 +860,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void testA11y_scrollUp() {

        mAccessibiltyDelegate.performAccessibilityAction(

        mAccessibilityDelegate.performAccessibilityAction(

                mView,

                AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_UP.getId(),

                null);
@@ -1329,11 +1323,11 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    public void testQsToBeImmediatelyExpandedWhenOpeningPanelInSplitShade() {

        enableSplitShade(/* enabled= */ true);

        mShadeExpansionStateManager.updateState(STATE_CLOSED);

        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isFalse();

        assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isFalse();



        mShadeExpansionStateManager.updateState(STATE_OPENING);



        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isTrue();

        assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isTrue();

    }



    @Test
@@ -1345,18 +1339,18 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        // going to lockscreen would trigger STATE_OPENING

        mShadeExpansionStateManager.updateState(STATE_OPENING);



        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isFalse();

        assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isFalse();

    }



    @Test

    public void testQsImmediateResetsWhenPanelOpensOrCloses() {

        mNotificationPanelViewController.mQsExpandImmediate = true;

        mNotificationPanelViewController.setQsExpandImmediate(true);

        mShadeExpansionStateManager.updateState(STATE_OPEN);

        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isFalse();

        assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isFalse();



        mNotificationPanelViewController.mQsExpandImmediate = true;

        mNotificationPanelViewController.setQsExpandImmediate(true);

        mShadeExpansionStateManager.updateState(STATE_CLOSED);

        assertThat(mNotificationPanelViewController.mQsExpandImmediate).isFalse();

        assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isFalse();

    }



    @Test
@@ -1399,7 +1393,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void interceptTouchEvent_withinQs_shadeExpanded_startsQsTracking() {

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);

        when(mQsFrame.getX()).thenReturn(0f);

        when(mQsFrame.getWidth()).thenReturn(1000);

        when(mQsHeader.getTop()).thenReturn(0);
@@ -1419,7 +1413,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void interceptTouchEvent_withinQs_shadeExpanded_inSplitShade_doesNotStartQsTracking() {

        enableSplitShade(true);

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);

        when(mQsFrame.getX()).thenReturn(0f);

        when(mQsFrame.getWidth()).thenReturn(1000);

        when(mQsHeader.getTop()).thenReturn(0);
@@ -1495,7 +1489,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void onLayoutChange_fullWidth_updatesQSWithFullWithTrue() {

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);



        setIsFullWidth(true);
@@ -1504,7 +1498,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void onLayoutChange_notFullWidth_updatesQSWithFullWithFalse() {

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);



        setIsFullWidth(false);
@@ -1513,7 +1507,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 


    @Test

    public void onLayoutChange_qsNotSet_doesNotCrash() {

        mNotificationPanelViewController.mQs = null;

        mNotificationPanelViewController.setQs(null);



        triggerLayoutChange();

    }
@@ -1539,7 +1533,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void setQsExpansion_lockscreenShadeTransitionInProgress_usesLockscreenSquishiness() {

        float squishinessFraction = 0.456f;

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);

        when(mLockscreenShadeTransitionController.getQsSquishTransitionFraction())

                .thenReturn(squishinessFraction);

        when(mNotificationStackScrollLayoutController.getNotificationSquishinessFraction())
@@ -1567,7 +1561,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    public void setQsExpansion_lockscreenShadeTransitionNotInProgress_usesStandardSquishiness() {

        float lsSquishinessFraction = 0.456f;

        float nsslSquishinessFraction = 0.987f;

        mNotificationPanelViewController.mQs = mQs;

        mNotificationPanelViewController.setQs(mQs);

        when(mLockscreenShadeTransitionController.getQsSquishTransitionFraction())

                .thenReturn(lsSquishinessFraction);

        when(mNotificationStackScrollLayoutController.getNotificationSquishinessFraction())
@@ -1586,7 +1580,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void onEmptySpaceClicked_notDozingAndOnKeyguard_requestsFaceAuth() {

        StatusBarStateController.StateListener statusBarStateListener =

                mNotificationPanelViewController.mStatusBarStateListener;

                mNotificationPanelViewController.getStatusBarStateListener();

        statusBarStateListener.onStateChanged(KEYGUARD);

        mNotificationPanelViewController.setDozing(false, false);
@@ -1601,7 +1595,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void onEmptySpaceClicked_notDozingAndFaceDetectionIsNotRunning_startsUnlockAnimation() {

        StatusBarStateController.StateListener statusBarStateListener =

                mNotificationPanelViewController.mStatusBarStateListener;

                mNotificationPanelViewController.getStatusBarStateListener();

        statusBarStateListener.onStateChanged(KEYGUARD);

        mNotificationPanelViewController.setDozing(false, false);

        when(mUpdateMonitor.requestFaceAuth(NOTIFICATION_PANEL_CLICKED)).thenReturn(false);
@@ -1616,7 +1610,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void onEmptySpaceClicked_notDozingAndFaceDetectionIsRunning_doesNotStartUnlockHint() {

        StatusBarStateController.StateListener statusBarStateListener =

                mNotificationPanelViewController.mStatusBarStateListener;

                mNotificationPanelViewController.getStatusBarStateListener();

        statusBarStateListener.onStateChanged(KEYGUARD);

        mNotificationPanelViewController.setDozing(false, false);

        when(mUpdateMonitor.requestFaceAuth(NOTIFICATION_PANEL_CLICKED)).thenReturn(true);
@@ -1631,7 +1625,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void onEmptySpaceClicked_whenDozingAndOnKeyguard_doesNotRequestFaceAuth() {

        StatusBarStateController.StateListener statusBarStateListener =

                mNotificationPanelViewController.mStatusBarStateListener;

                mNotificationPanelViewController.getStatusBarStateListener();

        statusBarStateListener.onStateChanged(KEYGUARD);

        mNotificationPanelViewController.setDozing(true, false);
@@ -1645,7 +1639,7 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    @Test

    public void onEmptySpaceClicked_whenStatusBarShadeLocked_doesNotRequestFaceAuth() {

        StatusBarStateController.StateListener statusBarStateListener =

                mNotificationPanelViewController.mStatusBarStateListener;

                mNotificationPanelViewController.getStatusBarStateListener();

        statusBarStateListener.onStateChanged(SHADE_LOCKED);



        mEmptySpaceClickListenerCaptor.getValue().onEmptySpaceClicked(0, 0);
@@ -1664,11 +1658,11 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
    public void onShadeFlingClosingEnd_mAmbientStateSetClose_thenOnExpansionStopped() {

        // Given: Shade is expanded

        mNotificationPanelViewController.notifyExpandingFinished();

        mNotificationPanelViewController.setIsClosing(false);

        mNotificationPanelViewController.setClosing(false);



        // When: Shade flings to close not canceled

        mNotificationPanelViewController.notifyExpandingStarted();

        mNotificationPanelViewController.setIsClosing(true);

        mNotificationPanelViewController.setClosing(true);

        mNotificationPanelViewController.onFlingEnd(false);



        // Then: AmbientState's mIsClosing should be set to false