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

Commit 48ed6ba5 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add Teamfood flag enabling Predictive Back at runtime." into... 

Merge "Merge "Add Teamfood flag enabling Predictive Back at runtime." into tm-qpr-dev am: 23a1d2e3" into tm-qpr-dev-plus-aosp
parents 5c7030a9 d64268f9

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+5 −0
Original line number Diff line number Diff line
@@ -368,6 +368,11 @@ object Flags { 
    @JvmField

    val NEW_BACK_AFFORDANCE = unreleasedFlag(1203, "new_back_affordance", teamfood = false)



    // TODO(b/255854141): Tracking Bug

    @JvmField

    val WM_ENABLE_PREDICTIVE_BACK_SYSUI =

        unreleasedFlag(1204, "persist.wm.debug.predictive_back_sysui_enable", teamfood = false)



    // 1300 - screenshots

    // TODO(b/254512719): Tracking Bug

    @JvmField val SCREENSHOT_REQUEST_PROCESSOR = releasedFlag(1300, "screenshot_request_processor")

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

+5 −0
Original line number Diff line number Diff line
@@ -994,6 +994,11 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy.init();



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

        if (mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_SYSUI)) {

            mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

        }



        mKeyguardStateController.addCallback(new KeyguardStateController.Callback() {

            @Override

            public void onUnlockedChanged() {