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

Commit 1f889a05 authored by omarmt's avatar omarmt
Browse files

Add a flag for predictive back animation in QS Dialog in Flags.kt. 

Add an AnimationFeatureFlags interface to access flags from AnimationLib module

Test: m -j
Bug: 265639042
Change-Id: Ie6456b04b02601e285ee08f70a1af7a038557065
parent 2953bacf

packages/SystemUI/animation/src/com/android/systemui/animation/AnimationFeatureFlags.kt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
package com.android.systemui.animation



interface AnimationFeatureFlags {

    val isPredictiveBackQsDialogAnim: Boolean

        get() = false

}

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

+7 −4
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ object Flags { 
    val FSI_ON_DND_UPDATE = unreleasedFlag(259130119, "fsi_on_dnd_update", teamfood = true)



    // TODO(b/265804648): Tracking Bug

    @JvmField

    val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi")

    @JvmField val DISABLE_FSI = unreleasedFlag(265804648, "disable_fsi")



    // TODO(b/254512538): Tracking Bug

    val INSTANT_VOICE_REPLY = unreleasedFlag(111, "instant_voice_reply", teamfood = true)
@@ -474,6 +473,11 @@ object Flags { 
    val WM_SHADE_ANIMATE_BACK_GESTURE =

        unreleasedFlag(1208, "persist.wm.debug.shade_animate_back_gesture", teamfood = true)



    // TODO(b/265639042): Tracking Bug

    @JvmField

    val WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM =

        unreleasedFlag(1209, "persist.wm.debug.predictive_back_qs_dialog_anim", teamfood = true)



    // 1300 - screenshots

    // TODO(b/254513155): Tracking Bug

    @JvmField
@@ -564,6 +568,5 @@ object Flags { 


    // 2600 - keyboard shortcut

    // TODO(b/259352579): Tracking Bug

    @JvmField

    val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout")

    @JvmField val SHORTCUT_LIST_SEARCH_LAYOUT = unreleasedFlag(2600, "shortcut_list_search_layout")

}

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java

+16 −0
Original line number Diff line number Diff line
@@ -25,12 +25,15 @@ import android.util.Log; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.statusbar.IStatusBarService;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.AnimationFeatureFlags;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dump.DumpHandler;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.keyguard.domain.interactor.AlternateBouncerInteractor;

import com.android.systemui.media.controls.pipeline.MediaDataManager;

import com.android.systemui.plugins.ActivityStarter;
@@ -305,4 +308,17 @@ public interface CentralSurfacesDependenciesModule { 
        };

        return new DialogLaunchAnimator(callback, interactionJankMonitor);

    }



    /**

     */

    @Provides

    @SysUISingleton

    static AnimationFeatureFlags provideAnimationFeatureFlags(FeatureFlags featureFlags) {

        return new AnimationFeatureFlags() {

            @Override

            public boolean isPredictiveBackQsDialogAnim() {

                return featureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM);

            }

        };

    }

}