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

Commit 08649c80 authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Migrate WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM flag to aconfig 

Bug: 309545085
Flag: ACONFIG com.android.systemui.predictive_back_qs_dialog_anim DISABLED
Test: atest SystemUIDialogTest
Test: atest FontScalingDialogDelegateTest
Test: atest BroadcastDialogDelegateTest
Test: Manual, i.e. testing build on device and verifying behaviour of flagged feature
Change-Id: I94311d67f79fd18897bcf70afaae7067a9e227ad
parent 4249ead3

packages/SystemUI/aconfig/predictive_back.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ flag { 
    description: "Enable Predictive Back Animation in Bouncer"

    bug: "309545085"

}



flag {

    name: "predictive_back_animate_dialogs"

    namespace: "systemui"

    description: "Enable Predictive Back Animation for SysUI dialogs"

    bug: "309545085"

}
 
 No newline at end of file

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java

+9 −12
Original line number Diff line number Diff line
@@ -21,29 +21,30 @@ import static com.google.common.truth.Truth.assertThat; 
import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.BroadcastReceiver;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Configuration;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.testing.TestableLooper.RunWithLooper;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.systemui.Dependency;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.model.SysUiState;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;
@@ -60,18 +61,18 @@ import java.util.concurrent.atomic.AtomicBoolean; 
@SmallTest

public class SystemUIDialogTest extends SysuiTestCase {



    @Mock

    private FeatureFlags mFeatureFlags;

    @Mock

    private BroadcastDispatcher mBroadcastDispatcher;

    @Mock

    private SystemUIDialog.Delegate mDelegate;



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);



        mDependency.injectTestDependency(FeatureFlags.class, mFeatureFlags);

        mDependency.injectTestDependency(BroadcastDispatcher.class, mBroadcastDispatcher);

    }
@@ -110,16 +111,13 @@ public class SystemUIDialogTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_PREDICTIVE_BACK_ANIMATE_DIALOGS)

    public void usePredictiveBackAnimFlag() {

        when(mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM))

                .thenReturn(true);

        final SystemUIDialog dialog = new SystemUIDialog(mContext);



        dialog.show();



        assertTrue(dialog.isShowing());

        verify(mFeatureFlags, atLeast(1))

                .isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM);



        dialog.dismiss();

        assertFalse(dialog.isShowing());
@@ -174,7 +172,6 @@ public class SystemUIDialogTest extends SysuiTestCase { 
    private SystemUIDialog createDialogWithDelegate() {

        SystemUIDialog.Factory factory = new SystemUIDialog.Factory(

                getContext(),

                mFeatureFlags,

                Dependency.get(SystemUIDialogManager.class),

                Dependency.get(SysUiState.class),

                Dependency.get(BroadcastDispatcher.class),

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

+0 −5
Original line number Diff line number Diff line
@@ -448,11 +448,6 @@ object Flags { 
    // TODO(b/270987164): Tracking Bug

    @JvmField val TRACKPAD_GESTURE_FEATURES = releasedFlag("trackpad_gesture_features")



    // TODO(b/265639042): Tracking Bug

    @JvmField

    val WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM =

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



    // TODO(b/273800936): Tracking Bug

    @JvmField val TRACKPAD_GESTURE_COMMON = releasedFlag("trackpad_gesture_common")

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

+4 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.systemui.statusbar.dagger;



import static com.android.systemui.Flags.predictiveBackAnimateDialogs;



import android.content.Context;

import android.os.RemoteException;

import android.service.dreams.IDreamManager;
@@ -31,8 +33,6 @@ import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor 
import com.android.systemui.dagger.SysUISingleton;

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.media.controls.pipeline.MediaDataManager;

import com.android.systemui.power.domain.interactor.PowerInteractor;

import com.android.systemui.settings.DisplayTracker;
@@ -230,11 +230,11 @@ public interface CentralSurfacesDependenciesModule { 
    /** */

    @Provides

    @SysUISingleton

    static AnimationFeatureFlags provideAnimationFeatureFlags(FeatureFlags featureFlags) {

    static AnimationFeatureFlags provideAnimationFeatureFlags() {

        return new AnimationFeatureFlags() {

            @Override

            public boolean isPredictiveBackQsDialogAnim() {

                return featureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM);

                return predictiveBackAnimateDialogs();

            }

        };

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.savedstate.SavedStateRegistryOwner 
import androidx.savedstate.setViewTreeSavedStateRegistryOwner

import com.android.systemui.animation.DialogLaunchAnimator

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.model.SysUiState



/**
@@ -53,7 +52,6 @@ class ComponentSystemUIDialog( 
    context: Context,

    theme: Int,

    dismissOnDeviceLock: Boolean,

    featureFlags: FeatureFlags,

    dialogManager: SystemUIDialogManager,

    sysUiState: SysUiState,

    broadcastDispatcher: BroadcastDispatcher,
@@ -63,7 +61,6 @@ class ComponentSystemUIDialog( 
        context,

        theme,

        dismissOnDeviceLock,

        featureFlags,

        dialogManager,

        sysUiState,

        broadcastDispatcher,