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
diff --git a/packages/SystemUI/aconfig/predictive_back.aconfig b/packages/SystemUI/aconfig/predictive_back.aconfig
index 1ad1666..d0e6b28 100644
--- a/packages/SystemUI/aconfig/predictive_back.aconfig
+++ b/packages/SystemUI/aconfig/predictive_back.aconfig
@@ -19,4 +19,11 @@
namespace: "systemui"
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
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java
index de767e3..7274c0c 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/SystemUIDialogTest.java
@@ -21,29 +21,30 @@
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;
@@ -61,17 +62,17 @@
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 @@
}
@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 @@
private SystemUIDialog createDialogWithDelegate() {
SystemUIDialog.Factory factory = new SystemUIDialog.Factory(
getContext(),
- mFeatureFlags,
Dependency.get(SystemUIDialogManager.class),
Dependency.get(SysUiState.class),
Dependency.get(BroadcastDispatcher.class),
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 38c7c6a..699532c 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -448,11 +448,6 @@
// 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")
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
index a957095..32cd56c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java
@@ -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.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 @@
/** */
@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();
}
};
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt
index 38a6d39..13d7924 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt
@@ -34,7 +34,6 @@
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 @@
context: Context,
theme: Int,
dismissOnDeviceLock: Boolean,
- featureFlags: FeatureFlags,
dialogManager: SystemUIDialogManager,
sysUiState: SysUiState,
broadcastDispatcher: BroadcastDispatcher,
@@ -63,7 +61,6 @@
context,
theme,
dismissOnDeviceLock,
- featureFlags,
dialogManager,
sysUiState,
broadcastDispatcher,
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
index 3394eac..390d2c9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java
@@ -16,6 +16,8 @@
package com.android.systemui.statusbar.phone;
+import static com.android.systemui.Flags.predictiveBackAnimateDialogs;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
@@ -45,8 +47,6 @@
import com.android.systemui.animation.DialogLaunchAnimator;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.qualifiers.Application;
-import com.android.systemui.flags.FeatureFlags;
-import com.android.systemui.flags.Flags;
import com.android.systemui.model.SysUiState;
import com.android.systemui.res.R;
import com.android.systemui.shared.system.QuickStepContract;
@@ -78,7 +78,6 @@
public static final boolean DEFAULT_DISMISS_ON_DEVICE_LOCK = true;
private final Context mContext;
- private final FeatureFlags mFeatureFlags;
private final DialogDelegate<SystemUIDialog> mDelegate;
@Nullable private final DismissReceiver mDismissReceiver;
private final Handler mHandler = new Handler();
@@ -110,7 +109,6 @@
// SystemUIDialogFactory and make all other dialogs create a SystemUIDialog to which we set
// the content and attach listeners.
this(context, theme, dismissOnDeviceLock,
- Dependency.get(FeatureFlags.class),
Dependency.get(SystemUIDialogManager.class),
Dependency.get(SysUiState.class),
Dependency.get(BroadcastDispatcher.class),
@@ -119,7 +117,6 @@
public static class Factory {
private final Context mContext;
- private final FeatureFlags mFeatureFlags;
private final SystemUIDialogManager mSystemUIDialogManager;
private final SysUiState mSysUiState;
private final BroadcastDispatcher mBroadcastDispatcher;
@@ -128,13 +125,11 @@
@Inject
public Factory(
@Application Context context,
- FeatureFlags featureFlags,
SystemUIDialogManager systemUIDialogManager,
SysUiState sysUiState,
BroadcastDispatcher broadcastDispatcher,
DialogLaunchAnimator dialogLaunchAnimator) {
mContext = context;
- mFeatureFlags = featureFlags;
mSystemUIDialogManager = systemUIDialogManager;
mSysUiState = sysUiState;
mBroadcastDispatcher = broadcastDispatcher;
@@ -177,7 +172,6 @@
context,
DEFAULT_THEME,
DEFAULT_DISMISS_ON_DEVICE_LOCK,
- mFeatureFlags,
mSystemUIDialogManager,
mSysUiState,
mBroadcastDispatcher,
@@ -190,7 +184,6 @@
Context context,
int theme,
boolean dismissOnDeviceLock,
- FeatureFlags featureFlags,
SystemUIDialogManager dialogManager,
SysUiState sysUiState,
BroadcastDispatcher broadcastDispatcher,
@@ -199,7 +192,6 @@
context,
theme,
dismissOnDeviceLock,
- featureFlags,
dialogManager,
sysUiState,
broadcastDispatcher,
@@ -211,7 +203,6 @@
Context context,
int theme,
boolean dismissOnDeviceLock,
- FeatureFlags featureFlags,
SystemUIDialogManager dialogManager,
SysUiState sysUiState,
BroadcastDispatcher broadcastDispatcher,
@@ -221,7 +212,6 @@
context,
theme,
dismissOnDeviceLock,
- featureFlags,
dialogManager,
sysUiState,
broadcastDispatcher,
@@ -233,7 +223,6 @@
Context context,
int theme,
boolean dismissOnDeviceLock,
- FeatureFlags featureFlags,
SystemUIDialogManager dialogManager,
SysUiState sysUiState,
BroadcastDispatcher broadcastDispatcher,
@@ -241,7 +230,6 @@
DialogDelegate<SystemUIDialog> delegate) {
super(context, theme);
mContext = context;
- mFeatureFlags = featureFlags;
mDelegate = delegate;
applyFlags(this);
@@ -269,7 +257,7 @@
for (int i = 0; i < mOnCreateRunnables.size(); i++) {
mOnCreateRunnables.get(i).run();
}
- if (mFeatureFlags.isEnabled(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM)) {
+ if (predictiveBackAnimateDialogs()) {
DialogKt.registerAnimationOnBackInvoked(
/* dialog = */ this,
/* targetView = */ getWindow().getDecorView()
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt
index d91ca92..f3e8f62d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt
@@ -20,7 +20,6 @@
import com.android.systemui.animation.DialogLaunchAnimator
import com.android.systemui.broadcast.BroadcastDispatcher
import com.android.systemui.dagger.qualifiers.Application
-import com.android.systemui.flags.FeatureFlagsClassic
import com.android.systemui.model.SysUiState
import com.android.systemui.util.Assert
import javax.inject.Inject
@@ -30,7 +29,6 @@
@Inject
constructor(
@Application val applicationContext: Context,
- private val featureFlags: FeatureFlagsClassic,
private val dialogManager: SystemUIDialogManager,
private val sysUiState: SysUiState,
private val broadcastDispatcher: BroadcastDispatcher,
@@ -57,7 +55,6 @@
context,
theme,
dismissOnDeviceLock,
- featureFlags,
dialogManager,
sysUiState,
broadcastDispatcher,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt
index c525711..9b6c8cd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt
@@ -25,14 +25,12 @@
import android.widget.Button
import android.widget.SeekBar
import androidx.test.filters.SmallTest
-import com.android.systemui.res.R
import com.android.systemui.SysuiTestCase
import com.android.systemui.animation.DialogLaunchAnimator
import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView
import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView.OnSeekBarWithIconButtonsChangeListener
-import com.android.systemui.flags.FakeFeatureFlags
-import com.android.systemui.flags.Flags
import com.android.systemui.model.SysUiState
+import com.android.systemui.res.R
import com.android.systemui.settings.UserTracker
import com.android.systemui.statusbar.phone.SystemUIDialog
import com.android.systemui.statusbar.phone.SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK
@@ -78,7 +76,6 @@
@Mock private lateinit var dialogManager: SystemUIDialogManager
@Mock private lateinit var dialogFactory: SystemUIDialog.Factory
@Mock private lateinit var userTracker: UserTracker
- private val featureFlags = FakeFeatureFlags()
@Mock private lateinit var sysuiState: SysUiState
@Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator
@@ -88,7 +85,6 @@
testableLooper = TestableLooper.get(this)
val mainHandler = Handler(testableLooper.looper)
systemSettings = FakeSettings()
- featureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM, true)
// Guarantee that the systemSettings always starts with the default font scale.
systemSettings.putFloatForUser(Settings.System.FONT_SCALE, 1.0f, userTracker.userId)
secureSettings = FakeSettings()
@@ -96,29 +92,32 @@
backgroundDelayableExecutor = FakeExecutor(systemClock)
whenever(sysuiState.setFlag(anyInt(), anyBoolean())).thenReturn(sysuiState)
- fontScalingDialogDelegate = spy(FontScalingDialogDelegate(
- mContext,
- dialogFactory,
- LayoutInflater.from(mContext),
- systemSettings,
- secureSettings,
- systemClock,
- userTracker,
- mainHandler,
- backgroundDelayableExecutor
- ))
+ fontScalingDialogDelegate =
+ spy(
+ FontScalingDialogDelegate(
+ mContext,
+ dialogFactory,
+ LayoutInflater.from(mContext),
+ systemSettings,
+ secureSettings,
+ systemClock,
+ userTracker,
+ mainHandler,
+ backgroundDelayableExecutor
+ )
+ )
- dialog = SystemUIDialog(
- mContext,
- 0,
- DEFAULT_DISMISS_ON_DEVICE_LOCK,
- featureFlags,
- dialogManager,
- sysuiState,
- fakeBroadcastDispatcher,
- dialogLaunchAnimator,
- fontScalingDialogDelegate
- )
+ dialog =
+ SystemUIDialog(
+ mContext,
+ 0,
+ DEFAULT_DISMISS_ON_DEVICE_LOCK,
+ dialogManager,
+ sysuiState,
+ fakeBroadcastDispatcher,
+ dialogLaunchAnimator,
+ fontScalingDialogDelegate
+ )
whenever(dialogFactory.create(any(), any())).thenReturn(dialog)
}
@@ -299,11 +298,7 @@
// Default seekbar progress for font size is 1, simulate dragging to 0 without
// releasing the finger
changeListener.onStartTrackingTouch(seekBar)
- changeListener.onProgressChanged(
- seekBar,
- /* progress= */ 0,
- /* fromUser= */ false
- )
+ changeListener.onProgressChanged(seekBar, /* progress= */ 0, /* fromUser= */ false)
backgroundDelayableExecutor.advanceClockToNext()
backgroundDelayableExecutor.runAllReady()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java
index 3ff43c6..7d5aec6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java
@@ -17,7 +17,9 @@
package com.android.systemui.bluetooth;
import static com.android.systemui.statusbar.phone.SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
@@ -40,8 +42,6 @@
import com.android.systemui.SysuiTestCase;
import com.android.systemui.animation.DialogLaunchAnimator;
import com.android.systemui.broadcast.BroadcastSender;
-import com.android.systemui.flags.FakeFeatureFlags;
-import com.android.systemui.flags.Flags;
import com.android.systemui.media.dialog.MediaOutputDialogFactory;
import com.android.systemui.model.SysUiState;
import com.android.systemui.res.R;
@@ -72,7 +72,6 @@
LocalBluetoothLeBroadcast.class);
private final BroadcastSender mBroadcastSender = mock(BroadcastSender.class);
private BroadcastDialogDelegate mBroadcastDialogDelegate;
- private FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags();
@Mock SystemUIDialog.Factory mSystemUIDialogFactory;
@Mock SystemUIDialogManager mDialogManager;
@Mock SysUiState mSysUiState;
@@ -91,7 +90,6 @@
when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
when(mLocalBluetoothProfileManager.getLeAudioBroadcastProfile()).thenReturn(null);
- mFeatureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM, true);
when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState);
when(mSystemUIDialogFactory.create(any(), any())).thenReturn(mDialog);
@@ -110,7 +108,6 @@
mContext,
0,
DEFAULT_DISMISS_ON_DEVICE_LOCK,
- mFeatureFlags,
mDialogManager,
mSysUiState,
getFakeBroadcastDispatcher(),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java
index 35bf775..dc211303 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/reardisplay/RearDisplayDialogControllerTest.java
@@ -83,7 +83,6 @@
public void setup() {
MockitoAnnotations.initMocks(this);
- mFeatureFlags.set(Flags.WM_ENABLE_PREDICTIVE_BACK_QS_DIALOG_ANIM, true);
when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState);
when(mSystemUIDialogFactory.create()).thenReturn(mSystemUIDialog);
when(mSystemUIDialog.getContext()).thenReturn(mContext);
diff --git a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
index 7ce51ae..86ab01c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt
@@ -105,7 +105,6 @@
spy(
SystemUIDialog.Factory(
context,
- flags,
systemUIDialogManager,
sysuiState,
broadcastDispatcher,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java
index cb90cc5..0ba99f2 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java
@@ -44,7 +44,6 @@
import com.android.systemui.animation.DialogLaunchAnimator;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.flags.FakeFeatureFlags;
-import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags;
import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger;
import com.android.systemui.mediaprojection.SessionCreationSource;
@@ -113,7 +112,6 @@
mDialogFactory = new TestSystemUIDialogFactory(
mContext,
- mFeatureFlags,
Dependency.get(SystemUIDialogManager.class),
Dependency.get(SysUiState.class),
Dependency.get(BroadcastDispatcher.class),
@@ -313,14 +311,12 @@
TestSystemUIDialogFactory(
Context context,
- FeatureFlags featureFlags,
SystemUIDialogManager systemUIDialogManager,
SysUiState sysUiState,
BroadcastDispatcher broadcastDispatcher,
DialogLaunchAnimator dialogLaunchAnimator) {
super(
context,
- featureFlags,
systemUIDialogManager,
sysUiState,
broadcastDispatcher,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt
index 8f696e7..2399536 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt
@@ -74,7 +74,6 @@
val systemUIDialogFactory =
SystemUIDialog.Factory(
context,
- Dependency.get(FeatureFlags::class.java),
Dependency.get(SystemUIDialogManager::class.java),
Dependency.get(SysUiState::class.java),
Dependency.get(BroadcastDispatcher::class.java),