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

Commit 10d155ac authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Clean up predictive_back_sysui flag 

Bug: 327737297
Test: Presubmit
Test: Manual, i.e. verified predictive back animations in SystemUI
Flag: EXEMPT flag cleanup
Change-Id: I38abc6ffe98833505c6d09d7197ce9dac4627836
parent 6a3bd422

packages/SystemUI/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -413,7 +413,8 @@ 
        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true"

        tools:replace="android:appComponentFactory"

        android:appComponentFactory=".PhoneSystemUIAppComponentFactory">

        android:appComponentFactory=".PhoneSystemUIAppComponentFactory"

        android:enableOnBackInvokedCallback="true">

        <!-- Keep theme in sync with SystemUIApplication.onCreate().

             Setting the theme on the application does not affect views inflated by services.

             The application theme is set again from onCreate to take effect for those views. -->

packages/SystemUI/aconfig/predictive_back.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.systemui"

container: "system"



flag {

    name: "predictive_back_sysui"

    namespace: "systemui"

    description: "Predictive Back Dispatching for SysUI"

    bug: "327737297"

}



flag {

    name: "predictive_back_animate_shade"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlag.kt

+1 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.systemui.flags.FlagToken 
import com.android.systemui.flags.RefactorFlagUtils

import com.android.systemui.keyguard.KeyguardWmStateRefactor

import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun

import com.android.systemui.statusbar.phone.PredictiveBackSysUiFlag



/** Helper for reading or using the scene container flag state. */

object SceneContainerFlag {
@@ -36,8 +35,7 @@ object SceneContainerFlag { 
        get() =

            sceneContainer() && // mainAconfigFlag

                KeyguardWmStateRefactor.isEnabled &&

                NotificationThrottleHun.isEnabled &&

                PredictiveBackSysUiFlag.isEnabled

                NotificationThrottleHun.isEnabled



    // NOTE: Changes should also be made in getSecondaryFlags and @EnableSceneContainer
@@ -49,7 +47,6 @@ object SceneContainerFlag { 
        sequenceOf(

            KeyguardWmStateRefactor.token,

            NotificationThrottleHun.token,

            PredictiveBackSysUiFlag.token,

            // NOTE: Changes should also be made in isEnabled and @EnableSceneContainer

        )

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

+0 −7
Original line number Diff line number Diff line
@@ -829,10 +829,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mLightRevealScrim = lightRevealScrim;



        mViewCaptureAwareWindowManager = viewCaptureAwareWindowManager;



        if (PredictiveBackSysUiFlag.isEnabled()) {

            mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

        }

    }



    private void initBubbles(Bubbles bubbles) {
@@ -2993,9 +2989,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        public void onConfigChanged(Configuration newConfig) {

            updateResources();

            updateDisplaySize(); // populates mDisplayMetrics

            if (PredictiveBackSysUiFlag.isEnabled()) {

                mContext.getApplicationInfo().setEnableOnBackInvokedCallback(true);

            }



            if (DEBUG) {

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/PredictiveBackSysUiFlag.kt

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the predictive back flag state. */

@Suppress("NOTHING_TO_INLINE")

object PredictiveBackSysUiFlag {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_PREDICTIVE_BACK_SYSUI



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the refactor enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.predictiveBackSysui()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}