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

Commit 3d9d4e5f authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: 48ed6ba5

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



Change-Id: Ib3f1aea607e7e2d9261c3aee0e5158314d07037a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad31498c 48ed6ba5

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

+5 −0
Original line number Diff line number Diff line
@@ -366,6 +366,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
@@ -977,6 +977,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() {