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

Commit 797e3f87 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix sysui predictive back not working after navigation mode change" into main

parents c9f99b39 ff7b1af2

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

+3 −1
Original line number Diff line number Diff line
@@ -836,7 +836,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mLightRevealScrimViewModelLazy = lightRevealScrimViewModelLazy;

        mLightRevealScrim = lightRevealScrim;



        // Based on teamfood flag, turn predictive back dispatch on at runtime.

        if (predictiveBackSysui()) {

            mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

        }
@@ -3060,6 +3059,9 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        public void onConfigChanged(Configuration newConfig) {

            updateResources();

            updateDisplaySize(); // populates mDisplayMetrics

            if (predictiveBackSysui()) {

                mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

            }



            if (DEBUG) {

                Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration());