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

Commit b09bf1dd authored by Yining Liu's avatar Yining Liu Committed by Automerger Merge Worker
Browse files

Merge "Fix Unlabeled NotificationStackScrollLayout on lock screen" into udc-dev am: 931a039b 

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



Change-Id: Ic0de7e5c7e8b8b5fefebc0a8c3fb5437de082956
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a16a4e57 931a039b

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -4700,6 +4700,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (v instanceof ExpandableNotificationRow && !mController.isShowingEmptyShadeView()) {

        if (v instanceof ExpandableNotificationRow && !mController.isShowingEmptyShadeView()) {

            mController.updateShowEmptyShadeView();

            mController.updateShowEmptyShadeView();

            updateFooter();

            updateFooter();

            mController.updateImportantForAccessibility();

        }

        }





        updateSpeedBumpIndex();

        updateSpeedBumpIndex();
@@ -4711,6 +4712,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (v instanceof ExpandableNotificationRow && mController.isShowingEmptyShadeView()) {

        if (v instanceof ExpandableNotificationRow && mController.isShowingEmptyShadeView()) {

            mController.updateShowEmptyShadeView();

            mController.updateShowEmptyShadeView();

            updateFooter();

            updateFooter();

            mController.updateImportantForAccessibility();

        }

        }





        updateSpeedBumpIndex();

        updateSpeedBumpIndex();
@@ -4723,6 +4725,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        if (v instanceof ExpandableNotificationRow && mController.isShowingEmptyShadeView()) {

        if (v instanceof ExpandableNotificationRow && mController.isShowingEmptyShadeView()) {

            mController.updateShowEmptyShadeView();

            mController.updateShowEmptyShadeView();

            updateFooter();

            updateFooter();

            mController.updateImportantForAccessibility();

        }

        }





        updateSpeedBumpIndex();

        updateSpeedBumpIndex();

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

+18 −0
Original line number Original line Diff line number Diff line
@@ -327,6 +327,7 @@ public class NotificationStackScrollLayoutController { 
                    mView.updateSensitiveness(mStatusBarStateController.goingToFullShade(),

                    mView.updateSensitiveness(mStatusBarStateController.goingToFullShade(),

                            mLockscreenUserManager.isAnyProfilePublicMode());

                            mLockscreenUserManager.isAnyProfilePublicMode());

                    mView.onStatePostChange(mStatusBarStateController.fromShadeLocked());

                    mView.onStatePostChange(mStatusBarStateController.fromShadeLocked());

                    updateImportantForAccessibility();

                }

                }

            };

            };
@@ -1205,6 +1206,7 @@ public class NotificationStackScrollLayoutController { 
        if (mView.getVisibility() == View.VISIBLE) {

        if (mView.getVisibility() == View.VISIBLE) {

            // Synchronize EmptyShadeView visibility with the parent container.

            // Synchronize EmptyShadeView visibility with the parent container.

            updateShowEmptyShadeView();

            updateShowEmptyShadeView();

            updateImportantForAccessibility();

        }

        }

    }

    }
@@ -1231,6 +1233,22 @@ public class NotificationStackScrollLayoutController { 
        Trace.endSection();

        Trace.endSection();

    }

    }





    /**

     * Update the importantForAccessibility of NotificationStackScrollLayout.

     * <p>

     * We want the NSSL to be unimportant for accessibility when there's no

     * notifications in it while the device is on lock screen, to avoid unlablel NSSL view.

     * Otherwise, we want it to be important for accessibility to enable accessibility

     * auto-scrolling in NSSL.

     */

    public void updateImportantForAccessibility() {

        if (getVisibleNotificationCount() == 0 && mView.onKeyguard()) {

            mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

        } else {

            mView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);

        }

    }



    /**

    /**

     * @return true if {@link StatusBarStateController} is in transition to the KEYGUARD

     * @return true if {@link StatusBarStateController} is in transition to the KEYGUARD

     * and false otherwise.

     * and false otherwise.

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

+79 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import static org.mockito.Mockito.when; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.metrics.LogMaker;

import android.metrics.LogMaker;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.view.View;





import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -430,6 +431,84 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
        verify(mNotificationStackScrollLayout).setStatusBarState(KEYGUARD);

        verify(mNotificationStackScrollLayout).setStatusBarState(KEYGUARD);

    }

    }





    @Test

    public void updateImportantForAccessibility_noChild_onKeyGuard_notImportantForA11y() {

        // GIVEN: Controller is attached, active notifications is empty,

        // and mNotificationStackScrollLayout.onKeyguard() is true

        initController(/* viewIsAttached= */ true);

        when(mNotificationStackScrollLayout.onKeyguard()).thenReturn(true);

        mController.getNotifStackController().setNotifStats(NotifStats.getEmpty());



        // WHEN: call updateImportantForAccessibility

        mController.updateImportantForAccessibility();



        // THEN: mNotificationStackScrollLayout should not be important for A11y

        verify(mNotificationStackScrollLayout)

                .setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);

    }



    @Test

    public void updateImportantForAccessibility_hasChild_onKeyGuard_importantForA11y() {

        // GIVEN: Controller is attached, active notifications is not empty,

        // and mNotificationStackScrollLayout.onKeyguard() is true

        initController(/* viewIsAttached= */ true);

        when(mNotificationStackScrollLayout.onKeyguard()).thenReturn(true);

        mController.getNotifStackController().setNotifStats(

                new NotifStats(

                        /* numActiveNotifs = */ 1,

                        /* hasNonClearableAlertingNotifs = */ false,

                        /* hasClearableAlertingNotifs = */ false,

                        /* hasNonClearableSilentNotifs = */ false,

                        /* hasClearableSilentNotifs = */ false)

        );



        // WHEN: call updateImportantForAccessibility

        mController.updateImportantForAccessibility();



        // THEN: mNotificationStackScrollLayout should be important for A11y

        verify(mNotificationStackScrollLayout)

                .setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);

    }



    @Test

    public void updateImportantForAccessibility_hasChild_notOnKeyGuard_importantForA11y() {

        // GIVEN: Controller is attached, active notifications is not empty,

        // and mNotificationStackScrollLayout.onKeyguard() is false

        initController(/* viewIsAttached= */ true);

        when(mNotificationStackScrollLayout.onKeyguard()).thenReturn(false);

        mController.getNotifStackController().setNotifStats(

                new NotifStats(

                        /* numActiveNotifs = */ 1,

                        /* hasNonClearableAlertingNotifs = */ false,

                        /* hasClearableAlertingNotifs = */ false,

                        /* hasNonClearableSilentNotifs = */ false,

                        /* hasClearableSilentNotifs = */ false)

        );



        // WHEN: call updateImportantForAccessibility

        mController.updateImportantForAccessibility();



        // THEN: mNotificationStackScrollLayout should be important for A11y

        verify(mNotificationStackScrollLayout)

                .setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);

    }



    @Test

    public void updateImportantForAccessibility_noChild_notOnKeyGuard_importantForA11y() {

        // GIVEN: Controller is attached, active notifications is empty,

        // and mNotificationStackScrollLayout.onKeyguard() is false

        initController(/* viewIsAttached= */ true);

        when(mNotificationStackScrollLayout.onKeyguard()).thenReturn(false);

        mController.getNotifStackController().setNotifStats(NotifStats.getEmpty());



        // WHEN: call updateImportantForAccessibility

        mController.updateImportantForAccessibility();



        // THEN: mNotificationStackScrollLayout should be important for A11y

        verify(mNotificationStackScrollLayout)

                .setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);

    }



    private LogMaker logMatcher(int category, int type) {

    private LogMaker logMatcher(int category, int type) {

        return argThat(new LogMatcher(category, type));

        return argThat(new LogMatcher(category, type));

    }

    }