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

Commit fff93577 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Update enableTaskbarNoRecreate logic" into main

parents 9fc2fa34 057144e0

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
            }



        windowLayoutParams.providedInsets =

            if (enableTaskbarNoRecreate()) {

            if (enableTaskbarNoRecreate() && controllers.sharedState != null) {

                getProvidedInsets(

                    controllers.sharedState!!.insetsFrameProviders!!,

                    controllers.sharedState!!.insetsFrameProviders,

                    insetsRoundedCornerFlag

                )

            } else {

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public final class FeatureFlags { 
                // Task bar pinning and task bar nav bar unification are both dependent on

                // ENABLE_TASKBAR_NO_RECREATION. We want to turn ENABLE_TASKBAR_NO_RECREATION on

                // when either of the dependent features is turned on.

                || ENABLE_TASKBAR_PINNING.get() || ENABLE_TASKBAR_NAVBAR_UNIFICATION;

                || enableTaskbarPinning() || ENABLE_TASKBAR_NAVBAR_UNIFICATION;

    }



    // TODO(Block 16): Clean up flags