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

Unverified Commit 338240ee authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

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

The noted change oddly results in a null object deref in
hasActiveClearableNotifications(). The bug ID is not actually called out
in the ASB, so we'll not waste our time right now. If it eventually is,
or AOSP fixes up their tree then we'll reland.

This reverts commit 682622c1.

Change-Id: I56cebdcd4ab671a4bf2095fa1112546150e5075c
parent 0c885311

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

+0 −38
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ 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.ConfigurationController.ConfigurationListener;

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

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

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

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

import com.android.systemui.tuner.TunerService;
@@ -286,7 +284,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    private boolean mExpandedInThisMotion;

    private boolean mShouldShowShelfOnly;

    protected boolean mScrollingEnabled;

    private boolean mIsCurrentUserSetup;

    protected FooterView mFooterView;

    protected EmptyShadeView mEmptyShadeView;

    private boolean mDismissAllInProgress;
@@ -487,8 +484,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
    private final Rect mTmpRect = new Rect();

    private final NotificationEntryManager mEntryManager =

            Dependency.get(NotificationEntryManager.class);

    private final DeviceProvisionedController mDeviceProvisionedController =

            Dependency.get(DeviceProvisionedController.class);

    private final IStatusBarService mBarService = IStatusBarService.Stub.asInterface(

            ServiceManager.getService(Context.STATUS_BAR_SERVICE));

    @VisibleForTesting
@@ -610,28 +605,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        }, HIGH_PRIORITY, Settings.Secure.NOTIFICATION_DISMISS_RTL,

                LOCKSCREEN_TRANSLUCENT_NOTIFICATIONS_BG_ENABLED);



        mDeviceProvisionedController.addCallback(

                new DeviceProvisionedListener() {

                    @Override

                    public void onDeviceProvisionedChanged() {

                        updateCurrentUserIsSetup();

                    }



                    @Override

                    public void onUserSwitched() {

                        updateCurrentUserIsSetup();

                    }



                    @Override

                    public void onUserSetupChanged() {

                        updateCurrentUserIsSetup();

                    }



                    private void updateCurrentUserIsSetup() {

                        setCurrentUserSetup(mDeviceProvisionedController.isCurrentUserSetup());

                    }

                });



        mEntryManager.addNotificationEntryListener(new NotificationEntryListener() {

            @Override

            public void onPostEntryUpdated(NotificationEntry entry) {
@@ -724,7 +697,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        boolean showDismissView = mClearAllEnabled && hasActiveClearableNotifications(ROWS_ALL);

        boolean showFooterView = (showDismissView ||

                mEntryManager.getNotificationData().getActiveNotifications().size() != 0)

                && mIsCurrentUserSetup  // see: b/193149550

                && mStatusBarState != StatusBarState.KEYGUARD

                && !mRemoteInputManager.getController().isRemoteInputActive();
@@ -5774,16 +5746,6 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd 
        return MathUtils.smoothStep(0, totalDistance, dragDownAmount);

    }



    /**

     * 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/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutTest.java

+0 −27
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_noNotifications() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);

        assertEquals(0, mNotificationData.getActiveNotifications().size());



        mStackScroller.updateFooter();
@@ -309,8 +308,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_remoteInput() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        ArrayList<NotificationEntry> entries = new ArrayList<>();

        entries.add(mock(NotificationEntry.class));

        when(mNotificationData.getActiveNotifications()).thenReturn(entries);
@@ -328,8 +325,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
    @Test

    public void testUpdateFooter_oneClearableNotification() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        ArrayList<NotificationEntry> entries = new ArrayList<>();

        entries.add(mock(NotificationEntry.class));

        when(mNotificationData.getActiveNotifications()).thenReturn(entries);
@@ -343,29 +338,9 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 
        verify(mStackScroller).updateFooterView(true, true);

    }



    @Test

    public void testUpdateFooter_oneClearableNotification_beforeUserSetup() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(false);



        ArrayList<NotificationEntry> entries = new ArrayList<>();

        entries.add(mock(NotificationEntry.class));

        when(mNotificationData.getActiveNotifications()).thenReturn(entries);



        ExpandableNotificationRow row = mock(ExpandableNotificationRow.class);

        when(row.canViewBeDismissed()).thenReturn(true);

        when(mStackScroller.getChildCount()).thenReturn(1);

        when(mStackScroller.getChildAt(anyInt())).thenReturn(row);



        mStackScroller.updateFooter();

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

    }



    @Test

    public void testUpdateFooter_oneNonClearableNotification() {

        setBarStateForTest(StatusBarState.SHADE);

        mStackScroller.setCurrentUserSetup(true);



        ArrayList<NotificationEntry> entries = new ArrayList<>();

        entries.add(mock(NotificationEntry.class));

        when(mEntryManager.getNotificationData().getActiveNotifications()).thenReturn(entries);
@@ -377,8 +352,6 @@ public class NotificationStackScrollLayoutTest extends SysuiTestCase { 


    @Test

    public void testUpdateFooter_atEnd() {

        mStackScroller.setCurrentUserSetup(true);



        // add footer

        mStackScroller.inflateFooterView();