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

Commit d45997fb authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Push a11y title up to root view" into main

parents 9b58606e ec1aef47

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

+2 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ public final class NotificationPanelViewController implements 
        mWakeUpCoordinator = coordinator;

        mMainDispatcher = mainDispatcher;

        mAccessibilityManager = accessibilityManager;

        mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle());

        mView.getRootView().setAccessibilityPaneTitle(determineAccessibilityPaneTitle());

        setAlpha(255, false /* animate */);

        mCommandQueue = commandQueue;

        mDisplayId = displayId;
@@ -3385,7 +3385,7 @@ public final class NotificationPanelViewController implements 
        }



        if (mAccessibilityManager.isEnabled()) {

            mView.setAccessibilityPaneTitle(determineAccessibilityPaneTitle());

            mView.getRootView().setAccessibilityPaneTitle(determineAccessibilityPaneTitle());

        }



        if (!mFalsingManager.isUnlockingDisabled() && qsFullyExpanded

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

+1 −1
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum 
        }

        if (mAccessibilityManager.isEnabled()) {

            // TODO (b/265193930): remove dependency on NPVC

            mPanelView.setAccessibilityPaneTitle(

            mPanelView.getRootView().setAccessibilityPaneTitle(

                    mPanelViewControllerLazy.get().determineAccessibilityPaneTitle());

        }

        mNotificationStackScrollLayoutController.setMaxTopPadding(mMaxExpansionHeight);