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

Commit de1e281b authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug where the AssistComponent was outdated" into mnc-dev

parents 5ac88a39 9a634991

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+8 −0
Original line number Diff line number Diff line
@@ -311,4 +311,12 @@ public class AssistManager { 
    public void showDisclosure() {

        mAssistDisclosure.postShow();

    }



    public void onUserSwitched(int newUserId) {

        updateAssistInfo();

    }



    public void prepareBeforeInvocation() {

        updateAssistInfo();

    }

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    private int mShowSearchHoldoff = 0;

    private Runnable mInvokeAssist = new Runnable() {

        public void run() {

            mAssistManager.prepareBeforeInvocation();

            invokeAssistGesture(true /* vibrate */);

            awakenDreams();

            if (mNavigationBarView != null) {
@@ -2938,6 +2939,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        updateNotifications();

        resetUserSetupObserver();

        setControllerUsers();

        mAssistManager.onUserSwitched(newUserId);

    }



    private void setControllerUsers() {