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

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

Merge "Merge "Do not show the notification footer until the user is set up."... 

Merge "Merge "Do not show the notification footer until the user is set up." into sc-qpr1-dev am: 114f3ee9" into sc-v2-dev am: d39b1bc1 am: b17e81a8

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

Change-Id: Ic5e5002067bedb64779b563d549f5a25a461d590
parents 0cb583a1 b17e81a8

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+12 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
    private boolean mExpandedInThisMotion;

    private boolean mShouldShowShelfOnly;

    protected boolean mScrollingEnabled;

    private boolean mIsCurrentUserSetup;

    protected FooterView mFooterView;

    protected EmptyShadeView mEmptyShadeView;

    private boolean mDismissAllInProgress;
@@ -682,6 +683,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        boolean showDismissView = mClearAllEnabled &&

                mController.hasActiveClearableNotifications(ROWS_ALL);

        boolean showFooterView = (showDismissView || getVisibleNotificationCount() > 0)

                && mIsCurrentUserSetup  // see: b/193149550

                && mStatusBarState != StatusBarState.KEYGUARD

                && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()

                && !mIsRemoteInputActive;
@@ -5607,6 +5609,16 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mAnimateNextTopPaddingChange = true;

    }



    /**

     * Sets whether the current user is set up, which is required to show the footer (b/193149550)

     */

    public void setCurrentUserSetup(boolean isCurrentUserSetup) {

        if (mIsCurrentUserSetup != isCurrentUserSetup) {

            mIsCurrentUserSetup = isCurrentUserSetup;

            updateFooter();

        }

    }



    /**

     * A listener that is notified when the empty space below the notifications is clicked on

     */

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java

+30 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ import com.android.systemui.statusbar.phone.StatusBar; 
import com.android.systemui.statusbar.phone.dagger.StatusBarComponent;

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

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

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

import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;

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

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

import com.android.systemui.tuner.TunerService;
@@ -146,6 +148,7 @@ public class NotificationStackScrollLayoutController { 
    private final HeadsUpManagerPhone mHeadsUpManager;

    private final NotificationRoundnessManager mNotificationRoundnessManager;

    private final TunerService mTunerService;

    private final DeviceProvisionedController mDeviceProvisionedController;

    private final DynamicPrivacyController mDynamicPrivacyController;

    private final ConfigurationController mConfigurationController;

    private final ZenModeController mZenModeController;
@@ -226,6 +229,28 @@ public class NotificationStackScrollLayoutController { 
                }

            };



    private final DeviceProvisionedListener mDeviceProvisionedListener =

            new DeviceProvisionedListener() {

                @Override

                public void onDeviceProvisionedChanged() {

                    updateCurrentUserIsSetup();

                }



                @Override

                public void onUserSwitched() {

                    updateCurrentUserIsSetup();

                }



                @Override

                public void onUserSetupChanged() {

                    updateCurrentUserIsSetup();

                }



                private void updateCurrentUserIsSetup() {

                    mView.setCurrentUserSetup(mDeviceProvisionedController.isCurrentUserSetup());

                }

            };



    private final DynamicPrivacyController.Listener mDynamicPrivacyControllerListener = () -> {

        if (mView.isExpanded()) {

            // The bottom might change because we're using the final actual height of the view
@@ -600,6 +625,7 @@ public class NotificationStackScrollLayoutController { 
            HeadsUpManagerPhone headsUpManager,

            NotificationRoundnessManager notificationRoundnessManager,

            TunerService tunerService,

            DeviceProvisionedController deviceProvisionedController,

            DynamicPrivacyController dynamicPrivacyController,

            ConfigurationController configurationController,

            SysuiStatusBarStateController statusBarStateController,
@@ -636,6 +662,7 @@ public class NotificationStackScrollLayoutController { 
        mHeadsUpManager = headsUpManager;

        mNotificationRoundnessManager = notificationRoundnessManager;

        mTunerService = tunerService;

        mDeviceProvisionedController = deviceProvisionedController;

        mDynamicPrivacyController = dynamicPrivacyController;

        mConfigurationController = configurationController;

        mStatusBarStateController = statusBarStateController;
@@ -788,6 +815,9 @@ public class NotificationStackScrollLayoutController { 
            return Unit.INSTANCE;

        });



        // callback is invoked synchronously, updating mView immediately

        mDeviceProvisionedController.addCallback(mDeviceProvisionedListener);



        if (mView.isAttachedToWindow()) {

            mOnAttachStateChangeListener.onViewAttachedToWindow(mView);

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import com.android.systemui.statusbar.phone.ScrimController; 
import com.android.systemui.statusbar.phone.ShadeController;

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

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

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

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

import com.android.systemui.tuner.TunerService;
@@ -99,6 +100,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
    @Mock private HeadsUpManagerPhone mHeadsUpManager;

    @Mock private NotificationRoundnessManager mNotificationRoundnessManager;

    @Mock private TunerService mTunerService;

    @Mock private DeviceProvisionedController mDeviceProvisionedController;

    @Mock private DynamicPrivacyController mDynamicPrivacyController;

    @Mock private ConfigurationController mConfigurationController;

    @Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;
@@ -152,6 +154,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
                mHeadsUpManager,

                mNotificationRoundnessManager,

                mTunerService,

                mDeviceProvisionedController,

                mDynamicPrivacyController,

                mConfigurationController,

                mSysuiStatusBarStateController,

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+23 −0
Original line number Diff line number Diff line
@@ -280,6 +280,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_noNotifications() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        FooterView view = mock(FooterView.class);

        mStackScroller.setFooterView(view);

        mStackScroller.updateFooter();
@@ -289,6 +291,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_remoteInput() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        when(row.canViewBeDismissed()).thenReturn(true);
@@ -308,6 +311,7 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_oneClearableNotification() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        when(mEmptyShadeView.getVisibility()).thenReturn(GONE);

        when(mStackScrollLayoutController.hasActiveClearableNotifications(ROWS_ALL))
@@ -320,9 +324,26 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        verify(mStackScroller).updateFooterView(true, true, true);

    }



    @Test

    public void testUpdateFooter_oneClearableNotification_beforeUserSetup() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(false);



        when(mEmptyShadeView.getVisibility()).thenReturn(GONE);

        when(mStackScrollLayoutController.hasActiveClearableNotifications(ROWS_ALL))

                .thenReturn(true);

        when(mStackScrollLayoutController.hasActiveNotifications()).thenReturn(true);



        FooterView view = mock(FooterView.class);

        mStackScroller.setFooterView(view);

        mStackScroller.updateFooter();

        verify(mStackScroller).updateFooterView(false, true, true);

    }



    @Test

    public void testUpdateFooter_oneNonClearableNotification() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        when(row.canViewBeDismissed()).thenReturn(false);
@@ -341,6 +362,8 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 


    @Test

    public void testUpdateFooter_atEnd() {

        mStackScroller.setCurrentUserSetup(true);



        // add footer

        mStackScroller.inflateFooterView();