diff options
86 files changed, 503 insertions, 484 deletions
diff --git a/ktfmt_includes.txt b/ktfmt_includes.txt index a926fcb8d3d1..fe4750381fd0 100644 --- a/ktfmt_includes.txt +++ b/ktfmt_includes.txt @@ -505,7 +505,7 @@ -packages/SystemUI/tests/src/com/android/systemui/DisplayCutoutBaseViewTest.kt -packages/SystemUI/tests/src/com/android/systemui/InstanceIdSequenceFake.kt -packages/SystemUI/tests/src/com/android/systemui/ScreenDecorHwcLayerTest.kt --packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt +-packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt -packages/SystemUI/tests/src/com/android/systemui/animation/FontInterpolatorTest.kt -packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewTransitionAnimatorControllerTest.kt -packages/SystemUI/tests/src/com/android/systemui/animation/TextAnimatorTest.kt diff --git a/packages/SystemUI/animation/res/values/ids.xml b/packages/SystemUI/animation/res/values/ids.xml index 2d82307aca76..1a224ac7c1f7 100644 --- a/packages/SystemUI/animation/res/values/ids.xml +++ b/packages/SystemUI/animation/res/values/ids.xml @@ -15,7 +15,7 @@ limitations under the License. --> <resources> - <!-- DialogLaunchAnimator --> + <!-- DialogTransitionAnimator --> <item type="id" name="tag_dialog_background"/> <!-- ViewBoundsAnimator --> diff --git a/packages/SystemUI/animation/res/values/styles.xml b/packages/SystemUI/animation/res/values/styles.xml index 3b3f7f6128fa..3019eeef23a6 100644 --- a/packages/SystemUI/animation/res/values/styles.xml +++ b/packages/SystemUI/animation/res/values/styles.xml @@ -15,8 +15,8 @@ limitations under the License. --> <resources> - <!-- An animation used by DialogLaunchAnimator to make a dialog appear instantly (to animate --> - <!-- in-window) and disappear by fading out (when the exit into view is disabled). --> + <!-- An animation used by DialogTransitionAnimator to make a dialog appear instantly (to --> + <!-- animate in-window) and disappear by fading out (when the exit into view is disabled). --> <style name="Animation.LaunchAnimation" parent="@android:style/Animation"> <item name="android:windowEnterAnimation">@anim/launch_dialog_enter</item> <item name="android:windowExitAnimation">@anim/launch_dialog_exit</item> diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt index a3b3a0acd68d..dbdf970467b5 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt @@ -39,7 +39,7 @@ import com.android.systemui.util.maybeForceFullscreen import com.android.systemui.util.registerAnimationOnBackInvoked import kotlin.math.roundToInt -private const val TAG = "DialogLaunchAnimator" +private const val TAG = "DialogTransitionAnimator" /** * A class that allows dialogs to be started in a seamless way from a view that is transforming @@ -50,9 +50,9 @@ private const val TAG = "DialogLaunchAnimator" * @see show * @see showFromView * @see showFromDialog - * @see createActivityLaunchController + * @see createActivityTransitionController */ -class DialogLaunchAnimator +class DialogTransitionAnimator @JvmOverloads constructor( private val callback: Callback, @@ -166,9 +166,10 @@ constructor( // issues. if (source !is LaunchableView) { throw IllegalArgumentException( - "A DialogLaunchAnimator.Controller was created from a View that does not " + - "implement LaunchableView. This can lead to subtle bugs where the " + - "visibility of the View we are launching from is not what we expected." + "A DialogTransitionAnimator.Controller was created from a View that does " + + "not implement LaunchableView. This can lead to subtle bugs where " + + "the visibility of the View we are launching from is not what we " + + "expected." ) } @@ -181,7 +182,7 @@ constructor( return null } - return ViewDialogLaunchAnimatorController(source, cuj) + return ViewDialogTransitionAnimatorController(source, cuj) } } } @@ -305,7 +306,7 @@ constructor( Log.w( TAG, "Showing dialog $dialog normally as the dialog it is shown from was not shown " + - "using DialogLaunchAnimator" + "using DialogTransitionAnimator" ) dialog.show() return @@ -331,7 +332,7 @@ constructor( * @param view any view inside the dialog to animate. */ @JvmOverloads - fun createActivityLaunchController( + fun createActivityTransitionController( view: View, cujType: Int? = null, ): ActivityTransitionAnimator.Controller? { @@ -340,7 +341,7 @@ constructor( it.dialog.window?.decorView?.viewRootImpl == view.viewRootImpl } ?: return null - return createActivityLaunchController(animatedDialog, cujType) + return createActivityTransitionController(animatedDialog, cujType) } /** @@ -355,15 +356,15 @@ constructor( * @param dialog the dialog to animate. */ @JvmOverloads - fun createActivityLaunchController( + fun createActivityTransitionController( dialog: Dialog, cujType: Int? = null, ): ActivityTransitionAnimator.Controller? { val animatedDialog = openedDialogs.firstOrNull { it.dialog == dialog } ?: return null - return createActivityLaunchController(animatedDialog, cujType) + return createActivityTransitionController(animatedDialog, cujType) } - private fun createActivityLaunchController( + private fun createActivityTransitionController( animatedDialog: AnimatedDialog, cujType: Int? = null ): ActivityTransitionAnimator.Controller? { @@ -494,14 +495,14 @@ data class DialogCuj(@CujType val cujType: Int, val tag: String? = null) private class AnimatedDialog( private val transitionAnimator: TransitionAnimator, - private val callback: DialogLaunchAnimator.Callback, + private val callback: DialogTransitionAnimator.Callback, private val interactionJankMonitor: InteractionJankMonitor, /** * The controller of the source that triggered the dialog and that will animate into/from the * dialog. */ - val controller: DialogLaunchAnimator.Controller, + val controller: DialogTransitionAnimator.Controller, /** * A callback that will be called with this [AnimatedDialog] after the dialog was dismissed and diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/Expandable.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/Expandable.kt index 2ba5948c50cc..e4bb2adbefb4 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/Expandable.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/Expandable.kt @@ -28,14 +28,14 @@ interface Expandable { * @param cujType the CUJ type from the [com.android.internal.jank.InteractionJankMonitor] * associated to the launch that will use this controller. */ - fun activityLaunchController(cujType: Int? = null): ActivityTransitionAnimator.Controller? + fun activityTransitionController(cujType: Int? = null): ActivityTransitionAnimator.Controller? /** - * Create a [DialogLaunchAnimator.Controller] that can be used to expand this [Expandable] into - * a Dialog, or return `null` if this [Expandable] should not be animated (e.g. if it is + * Create a [DialogTransitionAnimator.Controller] that can be used to expand this [Expandable] + * into a Dialog, or return `null` if this [Expandable] should not be animated (e.g. if it is * currently not attached or visible). */ - fun dialogLaunchController(cuj: DialogCuj? = null): DialogLaunchAnimator.Controller? + fun dialogTransitionController(cuj: DialogCuj? = null): DialogTransitionAnimator.Controller? companion object { /** @@ -47,16 +47,16 @@ interface Expandable { @JvmStatic fun fromView(view: View): Expandable { return object : Expandable { - override fun activityLaunchController( + override fun activityTransitionController( cujType: Int?, ): ActivityTransitionAnimator.Controller? { return ActivityTransitionAnimator.Controller.fromView(view, cujType) } - override fun dialogLaunchController( + override fun dialogTransitionController( cuj: DialogCuj? - ): DialogLaunchAnimator.Controller? { - return DialogLaunchAnimator.Controller.fromView(view, cuj) + ): DialogTransitionAnimator.Controller? { + return DialogTransitionAnimator.Controller.fromView(view, cuj) } } } diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt index e07f945e069b..307bc95941ed 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogLaunchAnimatorController.kt +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ViewDialogTransitionAnimatorController.kt @@ -23,14 +23,14 @@ import android.view.ViewGroup import android.view.ViewRootImpl import com.android.internal.jank.InteractionJankMonitor -private const val TAG = "ViewDialogLaunchAnimatorController" +private const val TAG = "ViewDialogTransitionAnimatorController" -/** A [DialogLaunchAnimator.Controller] that can animate a [View] from/to a dialog. */ -class ViewDialogLaunchAnimatorController +/** A [DialogTransitionAnimator.Controller] that can animate a [View] from/to a dialog. */ +class ViewDialogTransitionAnimatorController internal constructor( private val source: View, override val cuj: DialogCuj?, -) : DialogLaunchAnimator.Controller { +) : DialogTransitionAnimator.Controller { override val viewRoot: ViewRootImpl? get() = source.viewRootImpl @@ -56,7 +56,7 @@ internal constructor( override fun stopDrawingInOverlay() { // Note: here we should remove the ghost from the overlay, but in practice this is - // already done by the launch controller created below. + // already done by the transition controller created below. if (source is LaunchableView) { // Make sure we allow the source to change its visibility again and restore its previous diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt index 8eb2f2e3bf2a..c95d12032d0a 100644 --- a/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt +++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/Expandable.kt @@ -97,12 +97,12 @@ import kotlin.math.min * * // For activities: * onClick = { expandable -> - * activityStarter.startActivity(intent, expandable.activityLaunchController()) + * activityStarter.startActivity(intent, expandable.activityTransitionController()) * }, * * // For dialogs: * onClick = { expandable -> - * dialogLaunchAnimator.show(dialog, controller.dialogLaunchController()) + * dialogTransitionAnimator.show(dialog, controller.dialogTransitionController()) * }, * ) { * ... diff --git a/packages/SystemUI/compose/core/src/com/android/compose/animation/ExpandableController.kt b/packages/SystemUI/compose/core/src/com/android/compose/animation/ExpandableController.kt index 84e5725b6ada..974ee3a40903 100644 --- a/packages/SystemUI/compose/core/src/com/android/compose/animation/ExpandableController.kt +++ b/packages/SystemUI/compose/core/src/com/android/compose/animation/ExpandableController.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.unit.LayoutDirection import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.animation.ActivityTransitionAnimator import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.animation.TransitionAnimator import kotlin.math.roundToInt @@ -133,7 +133,7 @@ internal class ExpandableControllerImpl( ) : ExpandableController { override val expandable: Expandable = object : Expandable { - override fun activityLaunchController( + override fun activityTransitionController( cujType: Int?, ): ActivityTransitionAnimator.Controller? { if (!isComposed.value) { @@ -143,7 +143,9 @@ internal class ExpandableControllerImpl( return activityController(cujType) } - override fun dialogLaunchController(cuj: DialogCuj?): DialogLaunchAnimator.Controller? { + override fun dialogTransitionController( + cuj: DialogCuj? + ): DialogTransitionAnimator.Controller? { if (!isComposed.value) { return null } @@ -275,8 +277,8 @@ internal class ExpandableControllerImpl( } } - private fun dialogController(cuj: DialogCuj?): DialogLaunchAnimator.Controller { - return object : DialogLaunchAnimator.Controller { + private fun dialogController(cuj: DialogCuj?): DialogTransitionAnimator.Controller { + return object : DialogTransitionAnimator.Controller { override val viewRoot: ViewRootImpl? = composeViewRoot.viewRootImpl override val sourceIdentity: Any = this@ExpandableControllerImpl override val cuj: DialogCuj? = cuj diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt b/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt index 23d3089d7be3..7d692cc17015 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt @@ -39,7 +39,7 @@ import com.android.compose.theme.PlatformTheme * ) * } * - * dialogLaunchAnimator.showFromView(dialog, viewThatWasClicked) + * dialogTransitionAnimator.showFromView(dialog, viewThatWasClicked) * ``` * * @param context the [Context] in which the dialog will be constructed. @@ -59,7 +59,7 @@ fun SystemUIDialogFactory.create( dialog.create() // Set the content. Note that the background of the dialog is drawn on the DecorView of the - // dialog directly, which makes it automatically work nicely with DialogLaunchAnimator. + // dialog directly, which makes it automatically work nicely with DialogTransitionAnimator. dialog.setContentView( ComposeView(context).apply { setContent { diff --git a/packages/SystemUI/docs/dialogs.md b/packages/SystemUI/docs/dialogs.md index 70baa9f18759..31700ae1c44a 100644 --- a/packages/SystemUI/docs/dialogs.md +++ b/packages/SystemUI/docs/dialogs.md @@ -39,7 +39,7 @@ All these calls should be made before `Dialog#create` or `Dialog#show` (which in ## Showing the dialog -When showing a dialog triggered by clicking on a `View`, you should use [DialogLaunchAnimator][6] to +When showing a dialog triggered by clicking on a `View`, you should use [DialogTransitionAnimator][6] to nicely animate the dialog from/to that `View`, instead of calling `Dialog.show`. This animator provides the following methods: @@ -48,7 +48,7 @@ This animator provides the following methods: same view. * `showFromDialog`: animates the dialog show from a currently showing dialog, and the dialog dismissal/cancel/hide back to that dialog. The originating dialog must have been shown using - `DialogLaunchAnimator`. + `DialogTransitionAnimator`. * `dismissStack`: dismisses a stack of dialogs that were launched using `showFromDialog` animating the top-most dialog back into the view that was used in the initial `showFromView`. @@ -68,7 +68,7 @@ val dialog = SystemUIDialog(context).apply { setNegativeButton(R.string.negative_button_text, ::onNegativeButton) setNeutralButton(R.string.neutral_button_text, ::onNeutralButton) } -dialogLaunchAnimator.showFromView(dialog, view) +dialogTransitionAnimator.showFromView(dialog, view) ``` [1]: /packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java @@ -76,4 +76,4 @@ dialogLaunchAnimator.showFromView(dialog, view) [3]: /packages/SystemUI/res/layout/alert_dialog_systemui.xml [4]: /packages/SystemUI/res/layout/alert_dialog_title_systemui.xml [5]: /packages/SystemUI/res/layout/alert_dialog_button_bar_systemui.xml -[6]: /packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt
\ No newline at end of file +[6]: /packages/SystemUI/animation/src/com/android/systemui/animation/DialogTransitionAnimator.kt
\ No newline at end of file diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt index 076834097717..e9b36b8b3b57 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfigTest.kt @@ -159,7 +159,7 @@ class QuickAccessWalletKeyguardQuickAffordanceConfigTest : SysuiTestCase() { fun onQuickAffordanceTriggered() { val animationController: ActivityTransitionAnimator.Controller = mock() val expandable: Expandable = mock { - whenever(this.activityLaunchController()).thenReturn(animationController) + whenever(this.activityTransitionController()).thenReturn(animationController) } assertThat(underTest.onTriggered(expandable)) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt index db414b724b63..0ebcf5608bff 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt @@ -23,7 +23,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue @@ -51,7 +51,6 @@ import com.android.systemui.res.R import com.android.systemui.settings.UserFileManager import com.android.systemui.settings.UserTracker import com.android.systemui.shade.domain.interactor.ShadeInteractor -import com.android.systemui.shade.domain.interactor.shadeInteractor import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.util.FakeSharedPreferences @@ -82,7 +81,7 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() { @Mock private lateinit var keyguardStateController: KeyguardStateController @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var activityStarter: ActivityStarter - @Mock private lateinit var launchAnimator: DialogLaunchAnimator + @Mock private lateinit var launchAnimator: DialogTransitionAnimator @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var shadeInteractor: ShadeInteractor @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingUserActionInteractorTest.kt index 2384915c8703..182a6040b3b3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingUserActionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingUserActionInteractorTest.kt @@ -22,7 +22,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.accessibility.fontscaling.FontScalingDialogDelegate -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.plugins.ActivityStarter @@ -60,7 +60,7 @@ class FontScalingUserActionInteractorTest : SysuiTestCase() { private lateinit var underTest: FontScalingTileUserActionInteractor @Mock private lateinit var fontScalingDialogDelegate: FontScalingDialogDelegate - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var dialog: SystemUIDialog @Mock private lateinit var activityStarter: ActivityStarter @@ -69,7 +69,7 @@ class FontScalingUserActionInteractorTest : SysuiTestCase() { @Before fun setup() { activityStarter = mock<ActivityStarter>() - dialogLaunchAnimator = mock<DialogLaunchAnimator>() + mDialogTransitionAnimator = mock<DialogTransitionAnimator>() dialog = mock<SystemUIDialog>() fontScalingDialogDelegate = mock<FontScalingDialogDelegate> { whenever(createDialog()).thenReturn(dialog) } @@ -81,7 +81,7 @@ class FontScalingUserActionInteractorTest : SysuiTestCase() { qsTileIntentUserActionHandler, { fontScalingDialogDelegate }, keyguardStateController, - dialogLaunchAnimator, + mDialogTransitionAnimator, activityStarter ) } @@ -103,7 +103,8 @@ class FontScalingUserActionInteractorTest : SysuiTestCase() { eq(false) ) argumentCaptor.value.run() - verify(dialogLaunchAnimator).showFromView(any(), eq(testView), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator) + .showFromView(any(), eq(testView), nullable(), anyBoolean()) } @Test @@ -123,7 +124,7 @@ class FontScalingUserActionInteractorTest : SysuiTestCase() { eq(false) ) argumentCaptor.value.run() - verify(dialogLaunchAnimator, never()) + verify(mDialogTransitionAnimator, never()) .showFromView(any(), eq(testView), nullable(), anyBoolean()) verify(dialog).show() } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractorTest.kt index 7091cb3b259c..2e9f24c67cad 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractorTest.kt @@ -23,7 +23,7 @@ import android.testing.LeakCheck import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.qs.tiles.base.actions.FakeQSTileIntentUserInputHandler import com.android.systemui.qs.tiles.base.actions.intentInputs import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx @@ -75,7 +75,7 @@ class DataSaverTileUserActionInteractorTest : SysuiTestCase() { EmptyCoroutineContext, dataSaverController, qsTileIntentUserActionHandler, - mock<DialogLaunchAnimator>(), + mock<DialogTransitionAnimator>(), dialogFactory, userFileManager, ) 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 452895745f95..1cdf8dc4a8e8 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 @@ -40,7 +40,7 @@ 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.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.model.SysUiState; @@ -179,7 +179,7 @@ public class SystemUIDialogTest extends SysuiTestCase { Dependency.get(SystemUIDialogManager.class), Dependency.get(SysUiState.class), Dependency.get(BroadcastDispatcher.class), - Dependency.get(DialogLaunchAnimator.class) + Dependency.get(DialogTransitionAnimator.class) ); return factory.create(mDelegate); } diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 1a34cc4fc3a9..70c402949bbc 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -27,7 +27,7 @@ import com.android.internal.util.Preconditions; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.accessibility.AccessibilityButtonModeObserver; import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.assist.AssistManager; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; @@ -170,7 +170,7 @@ public class Dependency { @Inject Lazy<GroupMembershipManager> mGroupMembershipManagerLazy; @Inject Lazy<GroupExpansionManager> mGroupExpansionManagerLazy; @Inject Lazy<SystemUIDialogManager> mSystemUIDialogManagerLazy; - @Inject Lazy<DialogLaunchAnimator> mDialogLaunchAnimatorLazy; + @Inject Lazy<DialogTransitionAnimator> mDialogTransitionAnimatorLazy; @Inject Lazy<UserTracker> mUserTrackerLazy; @Inject @@ -224,7 +224,7 @@ public class Dependency { mProviders.put(GroupMembershipManager.class, mGroupMembershipManagerLazy::get); mProviders.put(GroupExpansionManager.class, mGroupExpansionManagerLazy::get); mProviders.put(SystemUIDialogManager.class, mSystemUIDialogManagerLazy::get); - mProviders.put(DialogLaunchAnimator.class, mDialogLaunchAnimatorLazy::get); + mProviders.put(DialogTransitionAnimator.class, mDialogTransitionAnimatorLazy::get); mProviders.put(UserTracker.class, mUserTrackerLazy::get); Dependency.setInstance(this); diff --git a/packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogController.java b/packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogController.java index b78b1f128376..161458fdb33e 100644 --- a/packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialogController.java @@ -18,7 +18,7 @@ package com.android.systemui.bluetooth; import android.view.View; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.statusbar.phone.SystemUIDialog; @@ -30,14 +30,14 @@ import javax.inject.Inject; @SysUISingleton public class BroadcastDialogController { - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final BroadcastDialogDelegate.Factory mBroadcastDialogFactory; @Inject public BroadcastDialogController( - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, BroadcastDialogDelegate.Factory broadcastDialogFactory) { - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mBroadcastDialogFactory = broadcastDialogFactory; } @@ -51,7 +51,7 @@ public class BroadcastDialogController { SystemUIDialog broadcastDialog = mBroadcastDialogFactory.create( currentBroadcastAppName, outputPkgName).createDialog(); if (view != null) { - mDialogLaunchAnimator.showFromView(broadcastDialog, view); + mDialogTransitionAnimator.showFromView(broadcastDialog, view); } else { broadcastDialog.show(); } diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java index a95ddb5a0201..2cff947eb9ab 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java @@ -116,7 +116,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.MultiListLayout; import com.android.systemui.MultiListLayout.MultiListAdapter; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.animation.Expandable; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.colorextraction.SysuiColorExtractor; @@ -256,7 +256,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene private int mOrientation; private final ShadeController mShadeController; private final KeyguardUpdateMonitor mKeyguardUpdateMonitor; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; @VisibleForTesting public enum GlobalActionsEvent implements UiEventLogger.UiEventEnum { @@ -367,7 +367,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene PackageManager packageManager, ShadeController shadeController, KeyguardUpdateMonitor keyguardUpdateMonitor, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, SelectedUserInteractor selectedUserInteractor) { mContext = context; mWindowManagerFuncs = windowManagerFuncs; @@ -402,7 +402,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene mOrientation = resources.getConfiguration().orientation; mShadeController = shadeController; mKeyguardUpdateMonitor = keyguardUpdateMonitor; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mSelectedUserInteractor = selectedUserInteractor; // receive broadcasts @@ -522,12 +522,12 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Don't acquire soft keyboard focus, to avoid destroying state when capturing bugreports mDialog.getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM); - DialogLaunchAnimator.Controller controller = - expandable != null ? expandable.dialogLaunchController( + DialogTransitionAnimator.Controller controller = + expandable != null ? expandable.dialogTransitionController( new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)) : null; if (controller != null) { - mDialogLaunchAnimator.show(mDialog, controller); + mDialogTransitionAnimator.show(mDialog, controller); } else { mDialog.show(); } @@ -1434,7 +1434,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an activity. // We don't want to animate back into the power button when that happens, so we // disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } else { Log.w(TAG, "Action long-clicked while mDialog is null."); @@ -1454,7 +1454,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an // activity. We don't want to animate back into the power button when that // happens, so we disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } } else { @@ -1525,7 +1525,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an activity. // We don't want to animate back into the power button when that happens, so we // disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } else { Log.w(TAG, "Action long-clicked while mDialog is null."); @@ -1542,7 +1542,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an activity. // We don't want to animate back into the power button when that happens, so we // disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } else { Log.w(TAG, "Action clicked while mDialog is null."); @@ -1597,7 +1597,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an activity. // We don't want to animate back into the power button when that happens, so we // disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } else { Log.w(TAG, "Action long-clicked while mDialog is null."); @@ -1614,7 +1614,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // Usually clicking an item shuts down the phone, locks, or starts an activity. // We don't want to animate back into the power button when that happens, so we // disable the dialog animation before dismissing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } else { Log.w(TAG, "Action clicked while mDialog is null."); @@ -2107,7 +2107,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // These broadcasts are usually received when locking the device, swiping up to // home (which collapses the shade), etc. In those cases, we usually don't want // to animate this dialog back into the view, so we disable the exit animations. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_DISMISS, reason)); } } else if (TelephonyManager.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED.equals(action)) { @@ -2577,7 +2577,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene // By default this dialog windowAnimationStyle is null, and therefore windowAnimations // should be equal to 0 which means we need to animate the dialog in-window. If it's not // equal to 0, it means it has been overridden to animate (e.g. by the - // DialogLaunchAnimator) so we don't run the animation. + // DialogTransitionAnimator) so we don't run the animation. boolean shouldAnimateInWindow = getWindow().getAttributes().windowAnimations == 0; if (shouldAnimateInWindow) { startAnimation(true /* isEnter */, null /* then */); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt index a988a5c2d67a..88eadd7be066 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/QuickAccessWalletKeyguardQuickAffordanceConfig.kt @@ -24,7 +24,6 @@ import android.service.quickaccesswallet.GetWalletCardsResponse import android.service.quickaccesswallet.QuickAccessWalletClient import android.service.quickaccesswallet.WalletCard import android.util.Log -import com.android.systemui.res.R import com.android.systemui.animation.Expandable import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow @@ -34,11 +33,12 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.res.R import com.android.systemui.wallet.controller.QuickAccessWalletController import com.android.systemui.wallet.util.getPaymentCards +import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.ExperimentalCoroutinesApi -import javax.inject.Inject import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flatMapLatest @@ -66,57 +66,62 @@ constructor( @OptIn(ExperimentalCoroutinesApi::class) override val lockScreenState: Flow<KeyguardQuickAffordanceConfig.LockScreenState> = conflatedCallbackFlow { - val callback = - object : QuickAccessWalletClient.OnWalletCardsRetrievedCallback { - override fun onWalletCardsRetrieved(response: GetWalletCardsResponse) { - val hasCards = getPaymentCards(response.walletCards)?.isNotEmpty() == true - trySendWithFailureLogging( - hasCards, - TAG, - ) - } + val callback = + object : QuickAccessWalletClient.OnWalletCardsRetrievedCallback { + override fun onWalletCardsRetrieved(response: GetWalletCardsResponse) { + val hasCards = + getPaymentCards(response.walletCards)?.isNotEmpty() == true + trySendWithFailureLogging( + hasCards, + TAG, + ) + } - override fun onWalletCardRetrievalError(error: GetWalletCardsError) { - Log.e(TAG, "Wallet card retrieval error, message: \"${error?.message}\"") - trySendWithFailureLogging( - null, - TAG, - ) + override fun onWalletCardRetrievalError(error: GetWalletCardsError) { + Log.e( + TAG, + "Wallet card retrieval error, message: \"${error?.message}\"" + ) + trySendWithFailureLogging( + null, + TAG, + ) + } } - } - - walletController.setupWalletChangeObservers( - callback, - QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE, - QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE - ) - - withContext(backgroundDispatcher) { - // Both must be called on background thread - walletController.updateWalletPreference() - walletController.queryWalletCards(callback) - } - awaitClose { - walletController.unregisterWalletChangeObservers( + walletController.setupWalletChangeObservers( + callback, QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE, QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE ) - } - }.flatMapLatest { hasCards -> - // If hasCards is null, this indicates an error occurred upon card retrieval - val state = - if (hasCards == null) { - KeyguardQuickAffordanceConfig.LockScreenState.Hidden - } else { - state( - isWalletAvailable(), - hasCards, - walletController.walletClient.tileIcon, + + withContext(backgroundDispatcher) { + // Both must be called on background thread + walletController.updateWalletPreference() + walletController.queryWalletCards(callback) + } + + awaitClose { + walletController.unregisterWalletChangeObservers( + QuickAccessWalletController.WalletChangeEvent.WALLET_PREFERENCE_CHANGE, + QuickAccessWalletController.WalletChangeEvent.DEFAULT_PAYMENT_APP_CHANGE ) } - flowOf(state) - } + } + .flatMapLatest { hasCards -> + // If hasCards is null, this indicates an error occurred upon card retrieval + val state = + if (hasCards == null) { + KeyguardQuickAffordanceConfig.LockScreenState.Hidden + } else { + state( + isWalletAvailable(), + hasCards, + walletController.walletClient.tileIcon, + ) + } + flowOf(state) + } override suspend fun getPickerScreenState(): KeyguardQuickAffordanceConfig.PickerScreenState { return when { @@ -145,7 +150,7 @@ constructor( ): KeyguardQuickAffordanceConfig.OnTriggeredResult { walletController.startQuickAccessUiIntent( activityStarter, - expandable?.activityLaunchController(), + expandable?.activityTransitionController(), /* hasCard= */ true, ) return KeyguardQuickAffordanceConfig.OnTriggeredResult.Handled diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt index a1f94250e149..8eb1a50086c6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt @@ -24,7 +24,7 @@ import android.content.Intent import android.util.Log import com.android.app.tracing.coroutines.withContext import com.android.internal.widget.LockPatternUtils -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -75,7 +75,7 @@ constructor( private val activityStarter: ActivityStarter, private val featureFlags: FeatureFlags, private val repository: Lazy<KeyguardQuickAffordanceRepository>, - private val launchAnimator: DialogLaunchAnimator, + private val launchAnimator: DialogTransitionAnimator, private val logger: KeyguardQuickAffordancesMetricsLogger, private val devicePolicyManager: DevicePolicyManager, private val dockManager: DockManager, @@ -322,7 +322,7 @@ constructor( } private fun showDialog(dialog: AlertDialog, expandable: Expandable?) { - expandable?.dialogLaunchController()?.let { controller -> + expandable?.dialogTransitionController()?.let { controller -> SystemUIDialog.applyFlags(dialog) SystemUIDialog.setShowForAllUsers(dialog, true) SystemUIDialog.registerDismissListener(dialog) @@ -350,13 +350,13 @@ constructor( activityStarter.postStartActivityDismissingKeyguard( intent, 0 /* delay */, - expandable?.activityLaunchController(), + expandable?.activityTransitionController(), ) } else { activityStarter.startActivity( intent, true /* dismissShade */, - expandable?.activityLaunchController(), + expandable?.activityTransitionController(), true /* showOverLockscreenWhenLocked */, ) } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt index 18d51030197a..b6e39372e34c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt @@ -24,7 +24,7 @@ import android.os.PowerExemptionManager import android.view.View import com.android.internal.logging.UiEventLogger import com.android.settingslib.bluetooth.LocalBluetoothManager -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.flags.FeatureFlags import com.android.systemui.media.nearby.NearbyMediaDevicesManager @@ -44,7 +44,7 @@ class MediaOutputBroadcastDialogFactory @Inject constructor( private val broadcastSender: BroadcastSender, private val notifCollection: CommonNotifCollection, private val uiEventLogger: UiEventLogger, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val nearbyMediaDevicesManager: NearbyMediaDevicesManager, private val audioManager: AudioManager, private val powerExemptionManager: PowerExemptionManager, @@ -61,7 +61,7 @@ class MediaOutputBroadcastDialogFactory @Inject constructor( val controller = MediaOutputController(context, packageName, mediaSessionManager, lbm, starter, notifCollection, - dialogLaunchAnimator, nearbyMediaDevicesManager, audioManager, + dialogTransitionAnimator, nearbyMediaDevicesManager, audioManager, powerExemptionManager, keyGuardManager, featureFlags, userTracker) val dialog = MediaOutputBroadcastDialog(context, aboveStatusBar, broadcastSender, controller) @@ -69,7 +69,7 @@ class MediaOutputBroadcastDialogFactory @Inject constructor( // Show the dialog. if (view != null) { - dialogLaunchAnimator.showFromView(dialog, view) + dialogTransitionAnimator.showFromView(dialog, view) } else { dialog.show() } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index 687f26871119..b3b7bceea0e0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -79,7 +79,7 @@ import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.animation.ActivityTransitionAnimator; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.nearby.NearbyMediaDevicesManager; @@ -125,7 +125,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, private final MediaSessionManager mMediaSessionManager; private final LocalBluetoothManager mLocalBluetoothManager; private final ActivityStarter mActivityStarter; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final CommonNotifCollection mNotifCollection; protected final Object mMediaDevicesLock = new Object(); @VisibleForTesting @@ -175,7 +175,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, MediaSessionManager mediaSessionManager, LocalBluetoothManager lbm, ActivityStarter starter, CommonNotifCollection notifCollection, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, NearbyMediaDevicesManager nearbyMediaDevicesManager, AudioManager audioManager, PowerExemptionManager powerExemptionManager, @@ -196,7 +196,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, InfoMediaManager imm = InfoMediaManager.createInstance(mContext, packageName, null, lbm); mLocalMediaManager = new LocalMediaManager(mContext, lbm, imm, packageName); mMetricLogger = new MediaOutputMetricLogger(mContext, mPackageName); - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mNearbyMediaDevicesManager = nearbyMediaDevicesManager; mColorItemContent = Utils.getColorStateListDefaultColor(mContext, R.color.media_dialog_item_main_content); @@ -401,7 +401,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, ComponentName componentName = mLocalMediaManager.getLinkedItemComponentName(); if (componentName != null) { ActivityTransitionAnimator.Controller controller = - mDialogLaunchAnimator.createActivityLaunchController(view); + mDialogTransitionAnimator.createActivityTransitionController(view); Intent launchIntent = new Intent(ACTION_TRANSFER_MEDIA); launchIntent.setComponent(componentName); launchIntent.putExtra(EXTRA_ROUTE_ID, routeId); @@ -413,7 +413,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, void tryToLaunchMediaApplication(View view) { ActivityTransitionAnimator.Controller controller = - mDialogLaunchAnimator.createActivityLaunchController(view); + mDialogTransitionAnimator.createActivityTransitionController(view); Intent launchIntent = getAppLaunchIntent(); if (launchIntent != null) { launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -882,7 +882,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, void launchBluetoothPairing(View view) { ActivityTransitionAnimator.Controller controller = - mDialogLaunchAnimator.createActivityLaunchController(view); + mDialogTransitionAnimator.createActivityTransitionController(view); if (controller == null || (mKeyGuardManager != null && mKeyGuardManager.isKeyguardLocked())) { @@ -936,7 +936,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, void launchMediaOutputBroadcastDialog(View mediaOutputDialog, BroadcastSender broadcastSender) { MediaOutputController controller = new MediaOutputController(mContext, mPackageName, mMediaSessionManager, mLocalBluetoothManager, mActivityStarter, - mNotifCollection, mDialogLaunchAnimator, mNearbyMediaDevicesManager, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyGuardManager, mFeatureFlags, mUserTracker); MediaOutputBroadcastDialog dialog = new MediaOutputBroadcastDialog(mContext, true, diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java index d40699ca088c..2f5f92586260 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java @@ -27,7 +27,7 @@ import androidx.core.graphics.drawable.IconCompat; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.res.R; @@ -37,7 +37,7 @@ import com.android.systemui.res.R; */ @SysUISingleton public class MediaOutputDialog extends MediaOutputBaseDialog { - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final UiEventLogger mUiEventLogger; MediaOutputDialog( @@ -45,11 +45,11 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { boolean aboveStatusbar, BroadcastSender broadcastSender, MediaOutputController mediaOutputController, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, UiEventLogger uiEventLogger, boolean includePlaybackAndAppMetadata) { super(context, broadcastSender, mediaOutputController, includePlaybackAndAppMetadata); - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mUiEventLogger = uiEventLogger; mAdapter = new MediaOutputAdapter(mMediaOutputController); if (!aboveStatusbar) { @@ -153,7 +153,7 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { } } else { mMediaOutputController.releaseSession(); - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); dismiss(); } } diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt index b04a7a4fd155..25d89fac1af5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt @@ -26,7 +26,7 @@ import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger import com.android.settingslib.bluetooth.LocalBluetoothManager import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.flags.FeatureFlags import com.android.systemui.media.nearby.NearbyMediaDevicesManager @@ -46,7 +46,7 @@ open class MediaOutputDialogFactory @Inject constructor( private val broadcastSender: BroadcastSender, private val notifCollection: CommonNotifCollection, private val uiEventLogger: UiEventLogger, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val nearbyMediaDevicesManager: NearbyMediaDevicesManager, private val audioManager: AudioManager, private val powerExemptionManager: PowerExemptionManager, @@ -80,16 +80,16 @@ open class MediaOutputDialogFactory @Inject constructor( val controller = MediaOutputController( context, packageName, mediaSessionManager, lbm, starter, notifCollection, - dialogLaunchAnimator, nearbyMediaDevicesManager, audioManager, + dialogTransitionAnimator, nearbyMediaDevicesManager, audioManager, powerExemptionManager, keyGuardManager, featureFlags, userTracker) val dialog = MediaOutputDialog(context, aboveStatusBar, broadcastSender, controller, - dialogLaunchAnimator, uiEventLogger, includePlaybackAndAppMetadata) + dialogTransitionAnimator, uiEventLogger, includePlaybackAndAppMetadata) mediaOutputDialog = dialog // Show the dialog. if (view != null) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, view, cuj = DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 7e06f5a21113..d476e6302a3b 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -66,7 +66,7 @@ import com.android.settingslib.Utils; import com.android.settingslib.fuelgauge.BatterySaverUtils; import com.android.systemui.SystemUIApplication; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.plugins.ActivityStarter; @@ -75,7 +75,6 @@ import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.util.NotificationChannels; -import com.android.systemui.util.settings.GlobalSettings; import com.android.systemui.volume.Events; import dagger.Lazy; @@ -87,7 +86,6 @@ import java.util.Locale; import java.util.Objects; import javax.inject.Inject; -import javax.inject.Provider; /** */ @@ -183,7 +181,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { private final UiEventLogger mUiEventLogger; private final UserTracker mUserTracker; private final Lazy<BatteryController> mBatteryControllerLazy; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; /** */ @@ -193,7 +191,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { ActivityStarter activityStarter, BroadcastSender broadcastSender, Lazy<BatteryController> batteryControllerLazy, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, UiEventLogger uiEventLogger, UserTracker userTracker, SystemUIDialog.Factory systemUIDialogFactory) { @@ -206,7 +204,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { mActivityStarter = activityStarter; mBroadcastSender = broadcastSender; mBatteryControllerLazy = batteryControllerLazy; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mUiEventLogger = uiEventLogger; mUserTracker = userTracker; mUseExtraSaverConfirmation = @@ -707,7 +705,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { }); WeakReference<View> ref = mBatteryControllerLazy.get().getLastPowerSaverStartView(); if (ref != null && ref.get() != null && ref.get().isAggregatedVisible()) { - mDialogLaunchAnimator.showFromView(d, ref.get(), + mDialogTransitionAnimator.showFromView(d, ref.get(), new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)); } else { diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogControllerV2.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogControllerV2.kt index f121630d180e..3faa044ca31d 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogControllerV2.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogControllerV2.kt @@ -30,7 +30,7 @@ import androidx.annotation.MainThread import androidx.annotation.WorkerThread import androidx.core.view.isVisible import com.android.internal.logging.UiEventLogger -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.appops.AppOpsController import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background @@ -74,7 +74,7 @@ class PrivacyDialogControllerV2( private val keyguardStateController: KeyguardStateController, private val appOpsController: AppOpsController, private val uiEventLogger: UiEventLogger, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val dialogProvider: DialogProvider ) { @@ -91,7 +91,7 @@ class PrivacyDialogControllerV2( keyguardStateController: KeyguardStateController, appOpsController: AppOpsController, uiEventLogger: UiEventLogger, - dialogLaunchAnimator: DialogLaunchAnimator + dialogTransitionAnimator: DialogTransitionAnimator ) : this( permissionManager, packageManager, @@ -104,7 +104,7 @@ class PrivacyDialogControllerV2( keyguardStateController, appOpsController, uiEventLogger, - dialogLaunchAnimator, + dialogTransitionAnimator, defaultDialogProvider ) @@ -282,7 +282,7 @@ class PrivacyDialogControllerV2( if (controller == null) { d.show() } else { - dialogLaunchAnimator.show(d, controller) + dialogTransitionAnimator.show(d, controller) } } else { d.show() @@ -298,10 +298,11 @@ class PrivacyDialogControllerV2( private fun getPrivacyDialogController( source: OngoingPrivacyChip - ): DialogLaunchAnimator.Controller? { + ): DialogTransitionAnimator.Controller? { val delegate = - DialogLaunchAnimator.Controller.fromView(source.launchableContentView) ?: return null - return object : DialogLaunchAnimator.Controller by delegate { + DialogTransitionAnimator.Controller.fromView(source.launchableContentView) + ?: return null + return object : DialogTransitionAnimator.Controller by delegate { override fun shouldAnimateExit() = source.isVisible } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt index b5def41fb3c7..a1071907cd3d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt @@ -56,7 +56,7 @@ import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.Dumpable import com.android.systemui.res.R import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.SysUISingleton @@ -146,7 +146,7 @@ class FgsManagerControllerImpl @Inject constructor( private val packageManager: PackageManager, private val userTracker: UserTracker, private val deviceConfigProxy: DeviceConfigProxy, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val broadcastDispatcher: BroadcastDispatcher, private val dumpManager: DumpManager, private val systemUIDialogFactory: SystemUIDialog.Factory, @@ -405,14 +405,14 @@ class FgsManagerControllerImpl @Inject constructor( mainExecutor.execute { val controller = - expandable?.dialogLaunchController( + expandable?.dialogTransitionController( DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG, ) ) if (controller != null) { - dialogLaunchAnimator.show(dialog, controller) + dialogTransitionAnimator.show(dialog, controller) } else { dialog.show() } @@ -610,13 +610,14 @@ class FgsManagerControllerImpl @Inject constructor( return newData.size } - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): - Boolean { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { return oldData[oldItemPosition] == newData[newItemPosition] } - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): - Boolean { + override fun areContentsTheSame( + oldItemPosition: Int, + newItemPosition: Int + ): Boolean { return oldData[oldItemPosition].stopped == newData[newItemPosition].stopped } }).dispatchUpdatesTo(this) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java index 5c96e98a4047..d38f8492c883 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSSecurityFooterUtils.java @@ -73,9 +73,8 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.jank.InteractionJankMonitor; -import com.android.systemui.res.R; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.animation.Expandable; import com.android.systemui.common.shared.model.ContentDescription; import com.android.systemui.common.shared.model.Icon; @@ -85,6 +84,7 @@ import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig; +import com.android.systemui.res.R; import com.android.systemui.security.data.model.SecurityModel; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; @@ -111,7 +111,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { private final ActivityStarter mActivityStarter; private final Handler mMainHandler; private final UserTracker mUserTracker; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final AtomicBoolean mShouldUseSettingsButton = new AtomicBoolean(false); @@ -180,7 +180,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { @Application Context context, DevicePolicyManager devicePolicyManager, UserTracker userTracker, @Main Handler mainHandler, ActivityStarter activityStarter, SecurityController securityController, @Background Looper bgLooper, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogTransitionAnimator dialogTransitionAnimator) { mContext = context; mDpm = devicePolicyManager; mUserTracker = userTracker; @@ -188,7 +188,7 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { mActivityStarter = activityStarter; mSecurityController = securityController; mBgHandler = new Handler(bgLooper); - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; } /** Show the device monitoring dialog. */ @@ -456,12 +456,12 @@ public class QSSecurityFooterUtils implements DialogInterface.OnClickListener { ? settingsButtonText : getNegativeButton(), this); mDialog.setView(dialogView); - DialogLaunchAnimator.Controller controller = - expandable != null ? expandable.dialogLaunchController(new DialogCuj( + DialogTransitionAnimator.Controller controller = + expandable != null ? expandable.dialogTransitionController(new DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)) : null; if (controller != null) { - mDialogLaunchAnimator.show(mDialog, controller); + mDialogTransitionAnimator.show(mDialog, controller); } else { mDialog.show(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt index 8e307408ba86..71615653236b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/footer/domain/interactor/FooterActionsInteractor.kt @@ -171,7 +171,7 @@ constructor( activityStarter.startActivity( Intent(Settings.ACTION_SETTINGS), true /* dismissShade */, - expandable.activityLaunchController( + expandable.activityTransitionController( InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON ), ) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 690b71100846..dc42b5c35223 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -40,7 +40,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.animation.ActivityTransitionAnimator; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; @@ -83,7 +83,7 @@ public class CastTile extends QSTileImpl<BooleanState> { private final CastController mController; private final KeyguardStateController mKeyguard; private final NetworkController mNetworkController; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final Callback mCallback = new Callback(); private final TileJavaAdapter mJavaAdapter; private final FeatureFlags mFeatureFlags; @@ -105,7 +105,7 @@ public class CastTile extends QSTileImpl<BooleanState> { KeyguardStateController keyguardStateController, NetworkController networkController, HotspotController hotspotController, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, ConnectivityRepository connectivityRepository, TileJavaAdapter javaAdapter, FeatureFlags featureFlags @@ -115,7 +115,7 @@ public class CastTile extends QSTileImpl<BooleanState> { mController = castController; mKeyguard = keyguardStateController; mNetworkController = networkController; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mJavaAdapter = javaAdapter; mFeatureFlags = featureFlags; mController.observe(this, mCallback); @@ -223,7 +223,7 @@ public class CastTile extends QSTileImpl<BooleanState> { ROUTE_TYPE_REMOTE_DISPLAY, v -> { ActivityTransitionAnimator.Controller controller = - mDialogLaunchAnimator.createActivityLaunchController(v); + mDialogTransitionAnimator.createActivityTransitionController(v); if (controller == null) { holder.mDialog.dismiss(); @@ -241,7 +241,7 @@ public class CastTile extends QSTileImpl<BooleanState> { mUiHandler.post(() -> { if (view != null) { - mDialogLaunchAnimator.showFromView(dialog, view, + mDialogTransitionAnimator.showFromView(dialog, view, new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)); } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index c9b002209fa8..58630a0b6b99 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -28,9 +28,8 @@ import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.systemui.Prefs; -import com.android.systemui.res.R; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; @@ -41,6 +40,7 @@ import com.android.systemui.qs.QSHost; import com.android.systemui.qs.QsEventLogger; import com.android.systemui.qs.logging.QSLogger; import com.android.systemui.qs.tileimpl.QSTileImpl; +import com.android.systemui.res.R; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.DataSaverController; @@ -54,7 +54,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements private static final String INTERACTION_JANK_TAG = "start_data_saver"; private final DataSaverController mDataSaverController; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final SystemUIDialog.Factory mSystemUIDialogFactory; @Inject @@ -69,13 +69,13 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements ActivityStarter activityStarter, QSLogger qsLogger, DataSaverController dataSaverController, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, SystemUIDialog.Factory systemUIDialogFactory ) { super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); mDataSaverController = dataSaverController; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mSystemUIDialogFactory = systemUIDialogFactory; mDataSaverController.observe(getLifecycle(), this); } @@ -98,8 +98,8 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements return; } - // Show a dialog to confirm first. Dialogs shown by the DialogLaunchAnimator must be created - // and shown on the main thread, so we post it to the UI handler. + // Show a dialog to confirm first. Dialogs shown by the DialogTransitionAnimator must be + // created and shown on the main thread, so we post it to the UI handler. mUiHandler.post(() -> { SystemUIDialog dialog = mSystemUIDialogFactory.create(); dialog.setTitle(com.android.internal.R.string.data_saver_enable_title); @@ -113,7 +113,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements dialog.setShowForAllUsers(true); if (view != null) { - mDialogLaunchAnimator.showFromView(dialog, view, new DialogCuj( + mDialogTransitionAnimator.showFromView(dialog, view, new DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG)); } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index f6518d1e8023..f62b60bd887f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -46,7 +46,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settingslib.notification.EnableZenModeDialog; import com.android.systemui.Prefs; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; @@ -82,7 +82,7 @@ public class DndTile extends QSTileImpl<BooleanState> { private final ZenModeController mController; private final SharedPreferences mSharedPreferences; private final UserSettingObserver mSettingZenDuration; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final QSZenModeDialogMetricsLogger mQSZenDialogMetricsLogger; private boolean mListening; @@ -101,14 +101,14 @@ public class DndTile extends QSTileImpl<BooleanState> { ZenModeController zenModeController, @Main SharedPreferences sharedPreferences, SecureSettings secureSettings, - DialogLaunchAnimator dialogLaunchAnimator + DialogTransitionAnimator dialogTransitionAnimator ) { super(host, uiEventLogger, backgroundLooper, mainHandler, falsingManager, metricsLogger, statusBarStateController, activityStarter, qsLogger); mController = zenModeController; mSharedPreferences = sharedPreferences; mController.observe(getLifecycle(), mZenCallback); - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mSettingZenDuration = new UserSettingObserver(secureSettings, mUiHandler, Settings.Secure.ZEN_DURATION, getHost().getUserId()) { @Override @@ -184,7 +184,7 @@ public class DndTile extends QSTileImpl<BooleanState> { mUiHandler.post(() -> { Dialog dialog = makeZenModeDialog(); if (view != null) { - mDialogLaunchAnimator.showFromView(dialog, view, new DialogCuj( + mDialogTransitionAnimator.showFromView(dialog, view, new DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG), /* animateBackgroundBoundsChange= */ false); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt index 14d365839417..f5018a2868c0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt @@ -22,10 +22,9 @@ import android.provider.Settings import android.view.View import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.MetricsLogger -import com.android.systemui.res.R import com.android.systemui.accessibility.fontscaling.FontScalingDialogDelegate import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.ActivityStarter @@ -36,6 +35,7 @@ import com.android.systemui.qs.QSHost import com.android.systemui.qs.QsEventLogger import com.android.systemui.qs.logging.QSLogger import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.res.R import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.policy.KeyguardStateController import javax.inject.Inject @@ -54,7 +54,7 @@ constructor( activityStarter: ActivityStarter, qsLogger: QSLogger, private val keyguardStateController: KeyguardStateController, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val fontScalingDialogDelegateProvider: Provider<FontScalingDialogDelegate> ) : QSTileImpl<QSTile.State?>( @@ -81,7 +81,7 @@ constructor( val runnable = Runnable { val dialog: SystemUIDialog = fontScalingDialogDelegateProvider.get().createDialog() if (animateFromView) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, view!!, DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt index 88863cbad1ee..04a0f420c91f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt @@ -31,7 +31,7 @@ import com.android.internal.jank.InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN import com.android.internal.logging.MetricsLogger import com.android.systemui.Flags.recordIssueQsTile import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.ActivityStarter @@ -64,7 +64,7 @@ constructor( qsLogger: QSLogger, private val keyguardDismissUtil: KeyguardDismissUtil, private val keyguardStateController: KeyguardStateController, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val userContextProvider: UserContextProvider, private val delegateFactory: RecordIssueDialogDelegate.Factory, ) : @@ -125,7 +125,7 @@ constructor( // We animate from the touched view only if we are not on the keyguard, given // that if we are we will dismiss it which will also collapse the shade. if (view != null && !keyguardStateController.isShowing) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, view, DialogCuj(CUJ_SHADE_DIALOG_OPEN, TILE_SPEC) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java index e89cc5af9a20..1a90d439c6d8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java @@ -31,7 +31,7 @@ import androidx.annotation.Nullable; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.logging.MetricsLogger; import com.android.systemui.animation.DialogCuj; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.flags.FeatureFlags; @@ -68,7 +68,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> private final KeyguardDismissUtil mKeyguardDismissUtil; private final KeyguardStateController mKeyguardStateController; private final Callback mCallback = new Callback(); - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; private final FeatureFlags mFlags; private final PanelInteractor mPanelInteractor; private final MediaProjectionMetricsLogger mMediaProjectionMetricsLogger; @@ -91,7 +91,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> RecordingController controller, KeyguardDismissUtil keyguardDismissUtil, KeyguardStateController keyguardStateController, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, PanelInteractor panelInteractor, MediaProjectionMetricsLogger mediaProjectionMetricsLogger, UserContextProvider userContextProvider @@ -103,7 +103,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> mFlags = flags; mKeyguardDismissUtil = keyguardDismissUtil; mKeyguardStateController = keyguardStateController; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mPanelInteractor = panelInteractor; mMediaProjectionMetricsLogger = mediaProjectionMetricsLogger; mUserContextProvider = userContextProvider; @@ -184,16 +184,16 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> // We dismiss the shade. Since starting the recording will also dismiss the dialog, we // disable the exit animation which looks weird when it happens at the same time as the // shade collapsing. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mPanelInteractor.collapsePanels(); }; final Dialog dialog = mController.createScreenRecordDialog(mContext, mFlags, - mDialogLaunchAnimator, mActivityStarter, onStartRecordingClicked); + mDialogTransitionAnimator, mActivityStarter, onStartRecordingClicked); ActivityStarter.OnDismissAction dismissAction = () -> { if (shouldAnimateFromView) { - mDialogLaunchAnimator.showFromView(dialog, view, new DialogCuj( + mDialogTransitionAnimator.showFromView(dialog, view, new DialogCuj( InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG), /* animateBackgroundBoundsChange= */ true); } else { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java index 9d214e7141a8..03e0c1eaf3e2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java @@ -60,7 +60,7 @@ import com.android.internal.logging.UiEventLogger; import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils; import com.android.systemui.Prefs; import com.android.systemui.accessibility.floatingmenu.AnnotationLinkSpan; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; @@ -88,7 +88,7 @@ public class InternetDialog extends SystemUIDialog implements private final Handler mHandler; private final Executor mBackgroundExecutor; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; @VisibleForTesting protected InternetAdapter mAdapter; @@ -162,7 +162,7 @@ public class InternetDialog extends SystemUIDialog implements public InternetDialog(Context context, InternetDialogFactory internetDialogFactory, InternetDialogController internetDialogController, boolean canConfigMobileData, boolean canConfigWifi, boolean aboveStatusBar, UiEventLogger uiEventLogger, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, @Main Handler handler, @Background Executor executor, KeyguardStateController keyguardStateController) { super(context); @@ -185,7 +185,7 @@ public class InternetDialog extends SystemUIDialog implements mKeyguard = keyguardStateController; mUiEventLogger = uiEventLogger; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mAdapter = new InternetAdapter(mInternetDialogController); if (!aboveStatusBar) { getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY); @@ -689,7 +689,7 @@ public class InternetDialog extends SystemUIDialog implements SystemUIDialog.setShowForAllUsers(mAlertDialog, true); SystemUIDialog.registerDismissListener(mAlertDialog); SystemUIDialog.setWindowOnTop(mAlertDialog, mKeyguard.isShowing()); - mDialogLaunchAnimator.showFromDialog(mAlertDialog, this, null, false); + mDialogTransitionAnimator.showFromDialog(mAlertDialog, this, null, false); } private void showTurnOffAutoDataSwitchDialog(int subId) { @@ -716,7 +716,7 @@ public class InternetDialog extends SystemUIDialog implements SystemUIDialog.setShowForAllUsers(mAlertDialog, true); SystemUIDialog.registerDismissListener(mAlertDialog); SystemUIDialog.setWindowOnTop(mAlertDialog, mKeyguard.isShowing()); - mDialogLaunchAnimator.showFromDialog(mAlertDialog, this, null, false); + mDialogTransitionAnimator.showFromDialog(mAlertDialog, this, null, false); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java index 41de65c18aaa..1410473acdfc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java @@ -76,7 +76,7 @@ import com.android.settingslib.net.SignalStrengthUtil; import com.android.settingslib.wifi.WifiUtils; import com.android.settingslib.wifi.dpp.WifiDppIntentHelper; import com.android.systemui.animation.ActivityTransitionAnimator; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Background; import com.android.systemui.dagger.qualifiers.Main; @@ -189,7 +189,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi private SignalDrawable mSignalDrawable; private SignalDrawable mSecondarySignalDrawable; // For the secondary mobile data sub in DSDS private LocationController mLocationController; - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; private boolean mHasWifiEntries; private WifiStateWorker mWifiStateWorker; private boolean mHasActiveSubId; @@ -250,7 +250,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi @Background Handler workerHandler, CarrierConfigTracker carrierConfigTracker, LocationController locationController, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, WifiStateWorker wifiStateWorker, FeatureFlags featureFlags ) { @@ -283,7 +283,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi mSignalDrawable = new SignalDrawable(mContext); mSecondarySignalDrawable = new SignalDrawable(mContext); mLocationController = locationController; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; mConnectedWifiInternetMonitor = new ConnectedWifiInternetMonitor(); mWifiStateWorker = wifiStateWorker; mFeatureFlags = featureFlags; @@ -749,7 +749,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi private void startActivity(Intent intent, View view) { ActivityTransitionAnimator.Controller controller = - mDialogLaunchAnimator.createActivityLaunchController(view); + mDialogTransitionAnimator.createActivityTransitionController(view); if (controller == null && mCallback != null) { mCallback.dismissDialog(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt index 796672dc0ead..c5f89834d5ce 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogFactory.kt @@ -22,7 +22,7 @@ import android.view.View import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main @@ -43,7 +43,7 @@ class InternetDialogFactory @Inject constructor( private val internetDialogController: InternetDialogController, private val context: Context, private val uiEventLogger: UiEventLogger, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val keyguardStateController: KeyguardStateController ) { companion object { @@ -67,11 +67,11 @@ class InternetDialogFactory @Inject constructor( internetDialog = InternetDialog( context, this, internetDialogController, canConfigMobileData, canConfigWifi, aboveStatusBar, uiEventLogger, - dialogLaunchAnimator, handler, + dialogTransitionAnimator, handler, executor, keyguardStateController ) if (view != null) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( internetDialog!!, view, animateBackgroundBoundsChange = true, cuj = DialogCuj( diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt index 194e7bc955c9..54bb95cafca6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModel.kt @@ -26,7 +26,7 @@ import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger import com.android.systemui.Prefs import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background @@ -58,7 +58,7 @@ internal class BluetoothTileDialogViewModel constructor( private val deviceItemInteractor: DeviceItemInteractor, private val bluetoothStateInteractor: BluetoothStateInteractor, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val activityStarter: ActivityStarter, private val systemClock: SystemClock, private val uiEventLogger: UiEventLogger, @@ -88,7 +88,7 @@ constructor( val dialog = createBluetoothTileDialog(context) view?.let { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, it, animateBackgroundBoundsChange = true, @@ -239,7 +239,7 @@ constructor( activityStarter.postStartActivityDismissingKeyguard( intent, 0, - dialogLaunchAnimator.createActivityLaunchController(view) + dialogTransitionAnimator.createActivityTransitionController(view) ) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingTileUserActionInteractor.kt index b6f4afb84259..db8b1a5a5d47 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/interactor/FontScalingTileUserActionInteractor.kt @@ -21,7 +21,7 @@ import android.provider.Settings import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.accessibility.fontscaling.FontScalingDialogDelegate import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.plugins.ActivityStarter import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandler @@ -44,7 +44,7 @@ constructor( private val qsTileIntentUserActionHandler: QSTileIntentUserInputHandler, private val fontScalingDialogDelegateProvider: Provider<FontScalingDialogDelegate>, private val keyguardStateController: KeyguardStateController, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val activityStarter: ActivityStarter, ) : QSTileUserActionInteractor<FontScalingTileModel> { @@ -59,7 +59,7 @@ constructor( val dialog: SystemUIDialog = fontScalingDialogDelegateProvider.get().createDialog() if (animateFromView) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, action.view!!, DialogCuj( diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractor.kt index af74409630ca..861faf5a0e4f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/interactor/DataSaverTileUserActionInteractor.kt @@ -21,7 +21,7 @@ import android.content.Intent import android.provider.Settings import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main @@ -47,7 +47,7 @@ constructor( @Background private val backgroundContext: CoroutineContext, private val dataSaverController: DataSaverController, private val qsTileIntentUserActionHandler: QSTileIntentUserInputHandler, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val systemUIDialogFactory: SystemUIDialog.Factory, userFileManager: UserFileManager, ) : QSTileUserActionInteractor<DataSaverTileModel> { @@ -71,7 +71,7 @@ constructor( } return@with } - // Show a dialog to confirm first. Dialogs shown by the DialogLaunchAnimator + // Show a dialog to confirm first. Dialogs shown by the DialogTransitionAnimator // must be created and shown on the main thread, so we post it to the UI // handler withContext(coroutineContext) { @@ -87,7 +87,7 @@ constructor( val dialog = systemUIDialogFactory.create(dialogDelegate, dialogContext) if (action.view != null) { - dialogLaunchAnimator.showFromView( + dialogTransitionAnimator.showFromView( dialog, action.view!!, DialogCuj( diff --git a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt index 41cd221186fe..95e7f56360c2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/user/UserSwitchDialogController.kt @@ -27,7 +27,7 @@ import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.UiEventLogger import com.android.systemui.res.R import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.dagger.SysUISingleton import com.android.systemui.plugins.ActivityStarter @@ -44,12 +44,12 @@ import javax.inject.Provider */ @SysUISingleton class UserSwitchDialogController @Inject constructor( - private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>, - private val activityStarter: ActivityStarter, - private val falsingManager: FalsingManager, - private val dialogLaunchAnimator: DialogLaunchAnimator, - private val uiEventLogger: UiEventLogger, - private val dialogFactory: SystemUIDialog.Factory + private val userDetailViewAdapterProvider: Provider<UserDetailView.Adapter>, + private val activityStarter: ActivityStarter, + private val falsingManager: FalsingManager, + private val dialogTransitionAnimator: DialogTransitionAnimator, + private val uiEventLogger: UiEventLogger, + private val dialogFactory: SystemUIDialog.Factory ) { companion object { @@ -75,7 +75,7 @@ class UserSwitchDialogController @Inject constructor( setNeutralButton(R.string.quick_settings_more_user_settings, { _, _ -> if (!falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { uiEventLogger.log(QSUserSwitcherEvent.QS_USER_MORE_SETTINGS) - val controller = dialogLaunchAnimator.createActivityLaunchController( + val controller = dialogTransitionAnimator.createActivityTransitionController( getButton(BUTTON_NEUTRAL) ) @@ -97,11 +97,11 @@ class UserSwitchDialogController @Inject constructor( adapter.linkToViewGroup(gridFrame.findViewById(R.id.grid)) val controller = - expandable.dialogLaunchController( + expandable.dialogTransitionController( DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN, INTERACTION_JANK_TAG) ) if (controller != null) { - dialogLaunchAnimator.show( + dialogTransitionAnimator.show( this, controller, ) @@ -110,7 +110,7 @@ class UserSwitchDialogController @Inject constructor( } uiEventLogger.log(QSUserSwitcherEvent.QS_USER_DETAIL_OPEN) - adapter.injectDialogShower(DialogShowerImpl(this, dialogLaunchAnimator)) + adapter.injectDialogShower(DialogShowerImpl(this, dialogTransitionAnimator)) } } diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java index 62d8fb99603e..a4ba2a241275 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java @@ -33,7 +33,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; @@ -157,7 +157,7 @@ public class RecordingController * If screen capturing is currently not allowed it will return a dialog * that warns users about it. */ public Dialog createScreenRecordDialog(Context context, FeatureFlags flags, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, ActivityStarter activityStarter, @Nullable Runnable onStartRecordingClicked) { if (mFlags.isEnabled(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES) 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 91340be8182b..f6d99bdefb9f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesDependenciesModule.java @@ -28,7 +28,7 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.systemui.CoreStartable; import com.android.systemui.animation.ActivityTransitionAnimator; import com.android.systemui.animation.AnimationFeatureFlags; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpHandler; @@ -197,18 +197,18 @@ public interface CentralSurfacesDependenciesModule { /** */ @Provides @SysUISingleton - static DialogLaunchAnimator provideDialogLaunchAnimator(IDreamManager dreamManager, + static DialogTransitionAnimator provideDialogTransitionAnimator(IDreamManager dreamManager, KeyguardStateController keyguardStateController, Lazy<AlternateBouncerInteractor> alternateBouncerInteractor, InteractionJankMonitor interactionJankMonitor, AnimationFeatureFlags animationFeatureFlags) { - DialogLaunchAnimator.Callback callback = new DialogLaunchAnimator.Callback() { + DialogTransitionAnimator.Callback callback = new DialogTransitionAnimator.Callback() { @Override public boolean isDreaming() { try { return dreamManager.isDreaming(); } catch (RemoteException e) { - Log.e("DialogLaunchAnimator.Callback", "dreamManager.isDreaming failed", e); + Log.e("DialogTransitionAnimator.Callback", "dreamManager.isDreaming failed", e); return false; } } @@ -223,7 +223,8 @@ public interface CentralSurfacesDependenciesModule { return alternateBouncerInteractor.get().canShowAlternateBouncerForFingerprint(); } }; - return new DialogLaunchAnimator(callback, interactionJankMonitor, animationFeatureFlags); + return new DialogTransitionAnimator( + callback, interactionJankMonitor, animationFeatureFlags); } /** */ 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 13d7924a8be6..4fe9c8ccca0b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ComponentSystemUIDialog.kt @@ -32,7 +32,7 @@ import androidx.savedstate.SavedStateRegistry import androidx.savedstate.SavedStateRegistryController import androidx.savedstate.SavedStateRegistryOwner import androidx.savedstate.setViewTreeSavedStateRegistryOwner -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.model.SysUiState @@ -55,7 +55,7 @@ class ComponentSystemUIDialog( dialogManager: SystemUIDialogManager, sysUiState: SysUiState, broadcastDispatcher: BroadcastDispatcher, - dialogLaunchAnimator: DialogLaunchAnimator, + dialogTransitionAnimator: DialogTransitionAnimator, ) : SystemUIDialog( context, @@ -64,7 +64,7 @@ class ComponentSystemUIDialog( dialogManager, sysUiState, broadcastDispatcher, - dialogLaunchAnimator + dialogTransitionAnimator ), LifecycleOwner, SavedStateRegistryOwner, 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 390d2c973882..f12a09b1062c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialog.java @@ -44,7 +44,7 @@ import android.view.WindowManager.LayoutParams; import androidx.annotation.Nullable; import com.android.systemui.Dependency; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.model.SysUiState; @@ -112,7 +112,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh Dependency.get(SystemUIDialogManager.class), Dependency.get(SysUiState.class), Dependency.get(BroadcastDispatcher.class), - Dependency.get(DialogLaunchAnimator.class)); + Dependency.get(DialogTransitionAnimator.class)); } public static class Factory { @@ -120,7 +120,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh private final SystemUIDialogManager mSystemUIDialogManager; private final SysUiState mSysUiState; private final BroadcastDispatcher mBroadcastDispatcher; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; @Inject public Factory( @@ -128,12 +128,12 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh SystemUIDialogManager systemUIDialogManager, SysUiState sysUiState, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogTransitionAnimator dialogTransitionAnimator) { mContext = context; mSystemUIDialogManager = systemUIDialogManager; mSysUiState = sysUiState; mBroadcastDispatcher = broadcastDispatcher; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; } /** Creates a new instance of {@link SystemUIDialog} with no customized behavior. @@ -175,7 +175,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh mSystemUIDialogManager, mSysUiState, mBroadcastDispatcher, - mDialogLaunchAnimator, + mDialogTransitionAnimator, dialogDelegate); } } @@ -187,7 +187,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh SystemUIDialogManager dialogManager, SysUiState sysUiState, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogTransitionAnimator dialogTransitionAnimator) { this( context, theme, @@ -195,7 +195,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh dialogManager, sysUiState, broadcastDispatcher, - dialogLaunchAnimator, + dialogTransitionAnimator, new DialogDelegate<>(){}); } @@ -206,7 +206,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh SystemUIDialogManager dialogManager, SysUiState sysUiState, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, Delegate delegate) { this( context, @@ -215,7 +215,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh dialogManager, sysUiState, broadcastDispatcher, - dialogLaunchAnimator, + dialogTransitionAnimator, (DialogDelegate<SystemUIDialog>) delegate); } @@ -226,7 +226,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh SystemUIDialogManager dialogManager, SysUiState sysUiState, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator, + DialogTransitionAnimator dialogTransitionAnimator, DialogDelegate<SystemUIDialog> delegate) { super(context, theme); mContext = context; @@ -238,7 +238,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh getWindow().setAttributes(attrs); mDismissReceiver = dismissOnDeviceLock ? new DismissReceiver(this, broadcastDispatcher, - dialogLaunchAnimator) : null; + dialogTransitionAnimator) : null; mDialogManager = dialogManager; mSysUiState = sysUiState; } @@ -499,7 +499,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh // TODO(b/219008720): Remove those calls to Dependency.get. DismissReceiver dismissReceiver = new DismissReceiver(dialog, Dependency.get(BroadcastDispatcher.class), - Dependency.get(DialogLaunchAnimator.class)); + Dependency.get(DialogTransitionAnimator.class)); dialog.setOnDismissListener(d -> { dismissReceiver.unregister(); if (dismissAction != null) dismissAction.run(); @@ -556,7 +556,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh } // We first look for the background on the dialogContentWithBackground added by - // DialogLaunchAnimator. If it's not there, we use the background of the DecorView. + // DialogTransitionAnimator. If it's not there, we use the background of the DecorView. View viewWithBackground = decorView.findViewByPredicate( view -> view.getTag( com.android.systemui.animation.R.id.tag_dialog_background) != null); @@ -580,13 +580,13 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh private final Dialog mDialog; private boolean mRegistered; private final BroadcastDispatcher mBroadcastDispatcher; - private final DialogLaunchAnimator mDialogLaunchAnimator; + private final DialogTransitionAnimator mDialogTransitionAnimator; DismissReceiver(Dialog dialog, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogTransitionAnimator dialogTransitionAnimator) { mDialog = dialog; mBroadcastDispatcher = broadcastDispatcher; - mDialogLaunchAnimator = dialogLaunchAnimator; + mDialogTransitionAnimator = dialogTransitionAnimator; } void register() { @@ -606,7 +606,7 @@ public class SystemUIDialog extends AlertDialog implements ViewRootImpl.ConfigCh // These broadcast are usually received when locking the device, swiping up to home // (which collapses the shade), etc. In those cases, we usually don't want to animate // back into the view. - mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); + mDialogTransitionAnimator.disableAllCurrentDialogsExitAnimations(); mDialog.dismiss(); } } 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 f3e8f62ddb5b..553edf9b5d13 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SystemUIDialogFactory.kt @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.phone import android.content.Context -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.model.SysUiState @@ -32,7 +32,7 @@ constructor( private val dialogManager: SystemUIDialogManager, private val sysUiState: SysUiState, private val broadcastDispatcher: BroadcastDispatcher, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, ) { /** * Create a new [ComponentSystemUIDialog]. @@ -58,7 +58,7 @@ constructor( dialogManager, sysUiState, broadcastDispatcher, - dialogLaunchAnimator, + dialogTransitionAnimator, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/AddUserDialog.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/AddUserDialog.kt index b88f9fb3cee2..3549cfee7c65 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/AddUserDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/AddUserDialog.kt @@ -22,7 +22,7 @@ import android.content.DialogInterface import android.content.Intent import android.os.UserHandle import com.android.settingslib.R -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.plugins.FalsingManager import com.android.systemui.statusbar.phone.SystemUIDialog @@ -36,7 +36,7 @@ class AddUserDialog( showEphemeralMessage: Boolean, private val falsingManager: FalsingManager, private val broadcastSender: BroadcastSender, - private val dialogLaunchAnimator: DialogLaunchAnimator + private val dialogTransitionAnimator: DialogTransitionAnimator ) : SystemUIDialog(context) { private val onClickListener = @@ -57,7 +57,7 @@ class AddUserDialog( return } - dialogLaunchAnimator.dismissStack(this@AddUserDialog) + dialogTransitionAnimator.dismissStack(this@AddUserDialog) if (ActivityManager.isUserAMonkey()) { return } diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/DialogShowerImpl.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/DialogShowerImpl.kt index 3fe2a7b19851..fe12458e3a93 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/DialogShowerImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/DialogShowerImpl.kt @@ -19,15 +19,15 @@ package com.android.systemui.user.ui.dialog import android.app.Dialog import android.content.DialogInterface import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.qs.user.UserSwitchDialogController.DialogShower /** Extracted from [UserSwitchDialogController] */ class DialogShowerImpl( private val animateFrom: Dialog, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, ) : DialogInterface by animateFrom, DialogShower { override fun showDialog(dialog: Dialog, cuj: DialogCuj) { - dialogLaunchAnimator.showFromDialog(dialog, animateFrom = animateFrom, cuj) + dialogTransitionAnimator.showFromDialog(dialog, animateFrom = animateFrom, cuj) } } diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/ExitGuestDialog.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/ExitGuestDialog.kt index 19ad44d8649f..6f991f42dc09 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/ExitGuestDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/ExitGuestDialog.kt @@ -20,7 +20,7 @@ import android.annotation.UserIdInt import android.content.Context import android.content.DialogInterface import com.android.settingslib.R -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.plugins.FalsingManager import com.android.systemui.statusbar.phone.SystemUIDialog @@ -32,7 +32,7 @@ class ExitGuestDialog( private val targetUserId: Int, isKeyguardShowing: Boolean, private val falsingManager: FalsingManager, - private val dialogLaunchAnimator: DialogLaunchAnimator, + private val dialogTransitionAnimator: DialogTransitionAnimator, private val onExitGuestUserListener: OnExitGuestUserListener, ) : SystemUIDialog(context) { @@ -59,7 +59,7 @@ class ExitGuestDialog( if (isGuestEphemeral) { if (which == BUTTON_POSITIVE) { - dialogLaunchAnimator.dismissStack(this@ExitGuestDialog) + dialogTransitionAnimator.dismissStack(this@ExitGuestDialog) // Ephemeral guest: exit guest, guest is removed by the system // on exit, since its marked ephemeral onExitGuestUserListener.onExitGuestUser(guestUserId, targetUserId, false) @@ -70,7 +70,7 @@ class ExitGuestDialog( } else { when (which) { BUTTON_POSITIVE -> { - dialogLaunchAnimator.dismissStack(this@ExitGuestDialog) + dialogTransitionAnimator.dismissStack(this@ExitGuestDialog) // Non-ephemeral guest: exit guest, guest is not removed by the system // on exit, since its marked non-ephemeral onExitGuestUserListener.onExitGuestUser( @@ -80,7 +80,7 @@ class ExitGuestDialog( ) } BUTTON_NEGATIVE -> { - dialogLaunchAnimator.dismissStack(this@ExitGuestDialog) + dialogTransitionAnimator.dismissStack(this@ExitGuestDialog) // Non-ephemeral guest: remove guest and then exit onExitGuestUserListener.onExitGuestUser(guestUserId, targetUserId, true) } diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitchDialog.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitchDialog.kt index 40582150a21d..e9353f23f215 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitchDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitchDialog.kt @@ -5,12 +5,12 @@ import android.content.Intent import android.provider.Settings import android.view.LayoutInflater import com.android.internal.logging.UiEventLogger -import com.android.systemui.res.R -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager import com.android.systemui.qs.QSUserSwitcherEvent import com.android.systemui.qs.tiles.UserDetailView +import com.android.systemui.res.R import com.android.systemui.statusbar.phone.SystemUIDialog /** @@ -23,7 +23,7 @@ class UserSwitchDialog( uiEventLogger: UiEventLogger, falsingManager: FalsingManager, activityStarter: ActivityStarter, - dialogLaunchAnimator: DialogLaunchAnimator, + dialogTransitionAnimator: DialogTransitionAnimator, ) : SystemUIDialog(context) { init { setShowForAllUsers(true) @@ -38,7 +38,7 @@ class UserSwitchDialog( if (!falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { uiEventLogger.log(QSUserSwitcherEvent.QS_USER_MORE_SETTINGS) val controller = - dialogLaunchAnimator.createActivityLaunchController( + dialogTransitionAnimator.createActivityTransitionController( getButton(BUTTON_NEUTRAL) ) @@ -60,7 +60,7 @@ class UserSwitchDialog( setView(gridFrame) adapter.linkToViewGroup(gridFrame.findViewById(R.id.grid)) - adapter.injectDialogShower(DialogShowerImpl(this, dialogLaunchAnimator)) + adapter.injectDialogShower(DialogShowerImpl(this, dialogTransitionAnimator)) } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt index 922dc0521a49..2d41f32efbe7 100644 --- a/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/user/ui/dialog/UserSwitcherDialogCoordinator.kt @@ -24,7 +24,7 @@ import com.android.internal.logging.UiEventLogger import com.android.settingslib.users.UserCreatingDialog import com.android.systemui.CoreStartable import com.android.systemui.animation.DialogCuj -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastSender import com.android.systemui.classifier.FalsingCollector import com.android.systemui.dagger.SysUISingleton @@ -52,7 +52,7 @@ constructor( @Application private val applicationScope: Lazy<CoroutineScope>, private val falsingManager: Lazy<FalsingManager>, private val broadcastSender: Lazy<BroadcastSender>, - private val dialogLaunchAnimator: Lazy<DialogLaunchAnimator>, + private val dialogTransitionAnimator: Lazy<DialogTransitionAnimator>, private val interactor: Lazy<UserSwitcherInteractor>, private val userDetailAdapterProvider: Provider<UserDetailView.Adapter>, private val eventLogger: Lazy<UiEventLogger>, @@ -82,7 +82,7 @@ constructor( showEphemeralMessage = request.showEphemeralMessage, falsingManager = falsingManager.get(), broadcastSender = broadcastSender.get(), - dialogLaunchAnimator = dialogLaunchAnimator.get(), + dialogTransitionAnimator = dialogTransitionAnimator.get(), ), DialogCuj( InteractionJankMonitor.CUJ_USER_DIALOG_OPEN, @@ -106,7 +106,7 @@ constructor( targetUserId = request.targetUserId, isKeyguardShowing = request.isKeyguardShowing, falsingManager = falsingManager.get(), - dialogLaunchAnimator = dialogLaunchAnimator.get(), + dialogTransitionAnimator = dialogTransitionAnimator.get(), onExitGuestUserListener = request.onExitGuestUser, ), DialogCuj( @@ -122,7 +122,7 @@ constructor( uiEventLogger = eventLogger.get(), falsingManager = falsingManager.get(), activityStarter = activityStarter.get(), - dialogLaunchAnimator = dialogLaunchAnimator.get(), + dialogTransitionAnimator = dialogTransitionAnimator.get(), ), DialogCuj( InteractionJankMonitor.CUJ_USER_DIALOG_OPEN, @@ -141,9 +141,9 @@ constructor( } currentDialog = dialog - val controller = request.expandable?.dialogLaunchController(dialogCuj) + val controller = request.expandable?.dialogTransitionController(dialogCuj) if (controller != null) { - dialogLaunchAnimator.get().show(dialog, controller) + dialogTransitionAnimator.get().show(dialog, controller) } else if (request.dialogShower != null && dialogCuj != null) { request.dialogShower?.showDialog(dialog, dialogCuj) } else { diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanelFactory.kt b/packages/SystemUI/src/com/android/systemui/volume/VolumePanelFactory.kt index 0debe0e4cd80..741b4644384a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanelFactory.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanelFactory.kt @@ -19,7 +19,7 @@ package com.android.systemui.volume import android.content.Context import android.util.Log import android.view.View -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dagger.SysUISingleton import com.android.systemui.plugins.ActivityStarter import javax.inject.Inject @@ -35,7 +35,7 @@ private val DEBUG = Log.isLoggable(TAG, Log.DEBUG) class VolumePanelFactory @Inject constructor( private val context: Context, private val activityStarter: ActivityStarter, - private val dialogLaunchAnimator: DialogLaunchAnimator + private val dialogTransitionAnimator: DialogTransitionAnimator ) { companion object { var volumePanelDialog: VolumePanelDialog? = null @@ -52,7 +52,11 @@ class VolumePanelFactory @Inject constructor( // Show the dialog. if (view != null) { - dialogLaunchAnimator.showFromView(dialog, view, animateBackgroundBoundsChange = true) + dialogTransitionAnimator.showFromView( + dialog, + view, + animateBackgroundBoundsChange = true + ) } else { dialog.show() } 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 9b6c8cdf7f9d..bf6ca0684398 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 @@ -26,7 +26,7 @@ import android.widget.Button import android.widget.SeekBar import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView import com.android.systemui.common.ui.view.SeekBarWithIconButtonsView.OnSeekBarWithIconButtonsChangeListener import com.android.systemui.model.SysUiState @@ -77,7 +77,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { @Mock private lateinit var dialogFactory: SystemUIDialog.Factory @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var sysuiState: SysUiState - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Before fun setUp() { @@ -115,7 +115,7 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { dialogManager, sysuiState, fakeBroadcastDispatcher, - dialogLaunchAnimator, + mDialogTransitionAnimator, fontScalingDialogDelegate ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt index a58642192336..96ce3abebeaf 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/DialogTransitionAnimatorTest.kt @@ -39,8 +39,8 @@ import org.mockito.junit.MockitoJUnit @SmallTest @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper -class DialogLaunchAnimatorTest : SysuiTestCase() { - private lateinit var dialogLaunchAnimator: DialogLaunchAnimator +class DialogTransitionAnimatorTest : SysuiTestCase() { + private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator private val attachedViews = mutableSetOf<View>() @Mock lateinit var interactionJankMonitor: InteractionJankMonitor @@ -48,8 +48,8 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { @Before fun setUp() { - dialogLaunchAnimator = - fakeDialogLaunchAnimator(interactionJankMonitor = interactionJankMonitor) + mDialogTransitionAnimator = + fakeDialogTransitionAnimator(interactionJankMonitor = interactionJankMonitor) } @After @@ -112,7 +112,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { assertTrue(firstDialog.isShowing) assertTrue(secondDialog.isShowing) runOnMainThreadAndWaitForIdleSync { - dialogLaunchAnimator.dismissStack(secondDialog) + mDialogTransitionAnimator.dismissStack(secondDialog) } assertFalse(firstDialog.isShowing) @@ -120,12 +120,12 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { } @Test - fun testActivityLaunchControllerFromDialog() { + fun testActivityTransitionControllerFromDialog() { val firstDialog = createAndShowDialog() val secondDialog = createDialogAndShowFromDialog(firstDialog) val controller = - dialogLaunchAnimator.createActivityLaunchController(secondDialog.contentView)!! + mDialogTransitionAnimator.createActivityTransitionController(secondDialog.contentView)!! // The dialog shouldn't be dismissable during the animation. runOnMainThreadAndWaitForIdleSync { @@ -148,23 +148,25 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { runOnMainThreadAndWaitForIdleSync { dialog.hide() } - assertNull(dialogLaunchAnimator.createActivityLaunchController(dialog.contentView)) + assertNull(mDialogTransitionAnimator.createActivityTransitionController(dialog.contentView)) } @Test fun testActivityLaunchWhenLockedWithoutAlternateAuth() { - val dialogLaunchAnimator = - fakeDialogLaunchAnimator(isUnlocked = false, isShowingAlternateAuthOnUnlock = false) - val dialog = createAndShowDialog(dialogLaunchAnimator) - assertNull(dialogLaunchAnimator.createActivityLaunchController(dialog.contentView)) + val dialogTransitionAnimator = + fakeDialogTransitionAnimator(isUnlocked = false, isShowingAlternateAuthOnUnlock = false) + val dialog = createAndShowDialog(dialogTransitionAnimator) + assertNull(dialogTransitionAnimator.createActivityTransitionController(dialog.contentView)) } @Test fun testActivityLaunchWhenLockedWithAlternateAuth() { - val dialogLaunchAnimator = - fakeDialogLaunchAnimator(isUnlocked = false, isShowingAlternateAuthOnUnlock = true) - val dialog = createAndShowDialog(dialogLaunchAnimator) - assertNotNull(dialogLaunchAnimator.createActivityLaunchController(dialog.contentView)) + val dialogTransitionAnimator = + fakeDialogTransitionAnimator(isUnlocked = false, isShowingAlternateAuthOnUnlock = true) + val dialog = createAndShowDialog(dialogTransitionAnimator) + assertNotNull( + dialogTransitionAnimator.createActivityTransitionController(dialog.contentView) + ) } @Test @@ -178,7 +180,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { val touchSurface = createTouchSurface() runOnMainThreadAndWaitForIdleSync { - dialogLaunchAnimator.showFromView(dialog, touchSurface) + mDialogTransitionAnimator.showFromView(dialog, touchSurface) } assertNotEquals(0, window.attributes.windowAnimations) } @@ -188,7 +190,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { val touchSurface = createTouchSurface() runOnMainThreadAndWaitForIdleSync { val dialog = TestDialog(context) - dialogLaunchAnimator.showFromView( + mDialogTransitionAnimator.showFromView( dialog, touchSurface, cuj = DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN)) } @@ -201,7 +203,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { val firstDialog = createAndShowDialog() runOnMainThreadAndWaitForIdleSync { val dialog = TestDialog(context) - dialogLaunchAnimator.showFromDialog( + mDialogTransitionAnimator.showFromDialog( dialog, firstDialog, cuj = DialogCuj(InteractionJankMonitor.CUJ_USER_DIALOG_OPEN)) dialog } @@ -265,7 +267,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { @Test fun creatingControllerFromNormalViewThrows() { assertThrows(IllegalArgumentException::class.java) { - DialogLaunchAnimator.Controller.fromView(FrameLayout(mContext)) + DialogTransitionAnimator.Controller.fromView(FrameLayout(mContext)) } } @@ -276,7 +278,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { } private fun createAndShowDialog( - animator: DialogLaunchAnimator = dialogLaunchAnimator, + animator: DialogTransitionAnimator = mDialogTransitionAnimator, ): TestDialog { val touchSurface = createTouchSurface() return showDialogFromView(touchSurface, animator) @@ -299,7 +301,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { private fun showDialogFromView( touchSurface: View, - animator: DialogLaunchAnimator = dialogLaunchAnimator, + animator: DialogTransitionAnimator = mDialogTransitionAnimator, ): TestDialog { return runOnMainThreadAndWaitForIdleSync { val dialog = TestDialog(context) @@ -311,7 +313,7 @@ class DialogLaunchAnimatorTest : SysuiTestCase() { private fun createDialogAndShowFromDialog(animateFrom: Dialog): TestDialog { return runOnMainThreadAndWaitForIdleSync { val dialog = TestDialog(context) - dialogLaunchAnimator.showFromDialog(dialog, animateFrom) + mDialogTransitionAnimator.showFromDialog(dialog, animateFrom) dialog } } 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 7d5aec6b7d4d..7a18477bffdd 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/bluetooth/BroadcastDialogDelegateTest.java @@ -40,7 +40,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.media.dialog.MediaOutputDialogFactory; import com.android.systemui.model.SysUiState; @@ -75,7 +75,8 @@ public class BroadcastDialogDelegateTest extends SysuiTestCase { @Mock SystemUIDialog.Factory mSystemUIDialogFactory; @Mock SystemUIDialogManager mDialogManager; @Mock SysUiState mSysUiState; - @Mock DialogLaunchAnimator mDialogLaunchAnimator; + @Mock + DialogTransitionAnimator mDialogTransitionAnimator; @Mock MediaOutputDialogFactory mMediaOutputDialogFactory; private SystemUIDialog mDialog; private TextView mTitle; @@ -111,7 +112,7 @@ public class BroadcastDialogDelegateTest extends SysuiTestCase { mDialogManager, mSysUiState, getFakeBroadcastDispatcher(), - mDialogLaunchAnimator, + mDialogTransitionAnimator, mBroadcastDialogDelegate ); diff --git a/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt index 35ac2ae4ed44..ab034652e0cc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/contrast/ContrastDialogDelegateTest.kt @@ -26,12 +26,11 @@ import android.view.View import android.widget.FrameLayout import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.FeatureFlags import com.android.systemui.model.SysUiState import com.android.systemui.settings.UserTracker -import com.android.systemui.statusbar.phone.DialogDelegate import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any @@ -68,7 +67,7 @@ class ContrastDialogDelegateTest : SysuiTestCase() { MockitoAnnotations.initMocks(this) mDependency.injectTestDependency(FeatureFlags::class.java, FakeFeatureFlags()) mDependency.injectTestDependency(SysUiState::class.java, sysuiState) - mDependency.injectMockDependency(DialogLaunchAnimator::class.java) + mDependency.injectMockDependency(DialogTransitionAnimator::class.java) whenever(sysuiState.setFlag(any(), any())).thenReturn(sysuiState) whenever(sysuiDialogFactory.create(any(SystemUIDialog.Delegate::class.java))) .thenReturn(sysuiDialog) diff --git a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java index 00009f778ac7..3f454925186c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java @@ -62,7 +62,7 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.plugins.GlobalActions; @@ -134,7 +134,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { @Mock private VibratorHelper mVibratorHelper; @Mock private ShadeController mShadeController; @Mock private KeyguardUpdateMonitor mKeyguardUpdateMonitor; - @Mock private DialogLaunchAnimator mDialogLaunchAnimator; + @Mock private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private SelectedUserInteractor mSelectedUserInteractor; @Mock private OnBackInvokedDispatcher mOnBackInvokedDispatcher; @Captor private ArgumentCaptor<OnBackInvokedCallback> mOnBackInvokedCallback; @@ -188,7 +188,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { mPackageManager, mShadeController, mKeyguardUpdateMonitor, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mSelectedUserInteractor); mGlobalActionsDialogLite.setZeroDialogPressDelayForTesting(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt index 076d72513633..1a6da7608849 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt @@ -32,7 +32,7 @@ import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.SystemUIAppComponentFactoryBase import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.dock.DockManagerFake import com.android.systemui.flags.FakeFeatureFlags import com.android.systemui.flags.Flags @@ -93,7 +93,7 @@ class CustomizationProviderTest : SysuiTestCase() { @Mock private lateinit var previewRenderer: KeyguardPreviewRenderer @Mock private lateinit var backgroundHandler: Handler @Mock private lateinit var previewSurfacePackage: SurfaceControlViewHost.SurfacePackage - @Mock private lateinit var launchAnimator: DialogLaunchAnimator + @Mock private lateinit var launchAnimator: DialogTransitionAnimator @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt index 798c7f757b58..45b2a4266ff6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt @@ -25,7 +25,7 @@ import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ActivityTransitionAnimator -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.Icon @@ -227,7 +227,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var animationController: ActivityTransitionAnimator.Controller @Mock private lateinit var expandable: Expandable - @Mock private lateinit var launchAnimator: DialogLaunchAnimator + @Mock private lateinit var launchAnimator: DialogTransitionAnimator @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @@ -249,7 +249,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(expandable.activityLaunchController()).thenReturn(animationController) + whenever(expandable.activityTransitionController()).thenReturn(animationController) userTracker = FakeUserTracker() homeControls = diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt index af38523c2fd3..4c57a05d1104 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt @@ -23,7 +23,7 @@ import androidx.test.filters.SmallTest import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.widget.LockPatternUtils import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.common.shared.model.Icon @@ -94,7 +94,7 @@ class KeyguardBottomAreaViewModelTest : SysuiTestCase() { @Mock private lateinit var keyguardStateController: KeyguardStateController @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var activityStarter: ActivityStarter - @Mock private lateinit var launchAnimator: DialogLaunchAnimator + @Mock private lateinit var launchAnimator: DialogTransitionAnimator @Mock private lateinit var devicePolicyManager: DevicePolicyManager @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt index b6a661be8c74..eded4dcb9bd6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt @@ -24,7 +24,7 @@ import androidx.test.filters.SmallTest import com.android.internal.widget.LockPatternUtils import com.android.systemui.Flags as AConfigFlags import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.Icon import com.android.systemui.coroutines.collectLastValue @@ -87,7 +87,7 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { @Mock private lateinit var userTracker: UserTracker @Mock private lateinit var lockPatternUtils: LockPatternUtils @Mock private lateinit var keyguardStateController: KeyguardStateController - @Mock private lateinit var launchAnimator: DialogLaunchAnimator + @Mock private lateinit var launchAnimator: DialogTransitionAnimator @Mock private lateinit var logger: KeyguardQuickAffordancesMetricsLogger @Mock private lateinit var shadeInteractor: ShadeInteractor @Mock diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java index e082ca81ba4f..f7873aa3e40e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBaseDialogTest.java @@ -48,7 +48,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.nearby.NearbyMediaDevicesManager; @@ -86,7 +86,8 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase { private final CommonNotifCollection mNotifCollection = mock(CommonNotifCollection.class); private NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( NearbyMediaDevicesManager.class); - private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final DialogTransitionAnimator mDialogTransitionAnimator = mock( + DialogTransitionAnimator.class); private final AudioManager mAudioManager = mock(AudioManager.class); private PowerExemptionManager mPowerExemptionManager = mock(PowerExemptionManager.class); private KeyguardManager mKeyguardManager = mock(KeyguardManager.class); @@ -122,7 +123,7 @@ public class MediaOutputBaseDialogTest extends SysuiTestCase { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); mMediaOutputBaseDialogImpl = new MediaOutputBaseDialogImpl(mContext, mBroadcastSender, diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java index e7400e7ba454..c9eb67e070ab 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogTest.java @@ -50,13 +50,13 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.settingslib.media.BluetoothMediaDevice; import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; +import com.android.systemui.res.R; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection; @@ -102,7 +102,8 @@ public class MediaOutputBroadcastDialogTest extends SysuiTestCase { private final BluetoothDevice mBluetoothSecondDevice = mock(BluetoothDevice.class); private final CachedBluetoothDevice mCachedBluetoothDevice = mock(CachedBluetoothDevice.class); private final CommonNotifCollection mNotifCollection = mock(CommonNotifCollection.class); - private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final DialogTransitionAnimator mDialogTransitionAnimator = mock( + DialogTransitionAnimator.class); private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( NearbyMediaDevicesManager.class); private final AudioManager mAudioManager = mock(AudioManager.class); @@ -125,7 +126,7 @@ public class MediaOutputBroadcastDialogTest extends SysuiTestCase { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); mMediaOutputController.mLocalMediaManager = mLocalMediaManager; diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java index 32b6f3854bfc..980eb5948615 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputControllerTest.java @@ -73,7 +73,7 @@ import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.ActivityTransitionAnimator; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.nearby.NearbyMediaDevicesManager; import com.android.systemui.plugins.ActivityStarter; @@ -108,7 +108,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { private static final String TEST_SESSION_ID = "test_session_id"; private static final String TEST_SESSION_NAME = "test_session_name"; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private ActivityTransitionAnimator.Controller mActivityTransitionAnimatorController; @Mock @@ -196,7 +196,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { mMediaOutputController = new MediaOutputController(mSpyContext, mPackageName, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); mLocalMediaManager = spy(mMediaOutputController.mLocalMediaManager); @@ -278,7 +278,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void start_withoutPackageName_verifyMediaControllerInit() { mMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -308,7 +308,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void stop_withoutPackageName_verifyMediaControllerDeinit() { mMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -338,8 +338,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { @Test public void tryToLaunchMediaApplication_intentNotNull_startActivity() { - when(mDialogLaunchAnimator.createActivityLaunchController(any(View.class))).thenReturn( - mController); + when(mDialogTransitionAnimator.createActivityTransitionController(any(View.class))) + .thenReturn(mController); Intent intent = new Intent(mPackageName); doReturn(intent).when(mPackageManager).getLaunchIntentForPackage(mPackageName); mMediaOutputController.start(mCallback); @@ -352,8 +352,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { @Test public void tryToLaunchInAppRoutingIntent_componentNameNotNull_startActivity() { - when(mDialogLaunchAnimator.createActivityLaunchController(any(View.class))).thenReturn( - mController); + when(mDialogTransitionAnimator.createActivityTransitionController(any(View.class))) + .thenReturn(mController); mMediaOutputController.start(mCallback); when(mLocalMediaManager.getLinkedItemComponentName()).thenReturn( new ComponentName(mPackageName, "")); @@ -553,7 +553,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { MediaOutputController testMediaOutputController = new MediaOutputController(mSpyContext, "", mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); testMediaOutputController.start(mCb); @@ -576,7 +576,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { MediaOutputController testMediaOutputController = new MediaOutputController(mSpyContext, "", mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); testMediaOutputController.start(mCb); @@ -612,7 +612,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { MediaOutputController testMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -628,7 +628,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { MediaOutputController testMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -896,7 +896,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { public void getNotificationLargeIcon_withoutPackageName_returnsNull() { mMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -1088,7 +1088,7 @@ public class MediaOutputControllerTest extends SysuiTestCase { MediaOutputController testMediaOutputController = new MediaOutputController(mSpyContext, null, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); @@ -1121,8 +1121,8 @@ public class MediaOutputControllerTest extends SysuiTestCase { @Test public void launchBluetoothPairing_isKeyguardLocked_dismissDialog() { - when(mDialogLaunchAnimator.createActivityLaunchController(mDialogLaunchView)).thenReturn( - mActivityTransitionAnimatorController); + when(mDialogTransitionAnimator.createActivityTransitionController(mDialogLaunchView)) + .thenReturn(mActivityTransitionAnimatorController); when(mKeyguardManager.isKeyguardLocked()).thenReturn(true); mMediaOutputController.mCallback = this.mCallback; diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java index d5dc502b1e6c..2b62f03c5c02 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputDialogTest.java @@ -50,7 +50,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.nearby.NearbyMediaDevicesManager; @@ -91,7 +91,8 @@ public class MediaOutputDialogTest extends SysuiTestCase { private final MediaDevice mMediaDevice = mock(MediaDevice.class); private final CommonNotifCollection mNotifCollection = mock(CommonNotifCollection.class); private final UiEventLogger mUiEventLogger = mock(UiEventLogger.class); - private final DialogLaunchAnimator mDialogLaunchAnimator = mock(DialogLaunchAnimator.class); + private final DialogTransitionAnimator mDialogTransitionAnimator = mock( + DialogTransitionAnimator.class); private final MediaMetadata mMediaMetadata = mock(MediaMetadata.class); private final MediaDescription mMediaDescription = mock(MediaDescription.class); private final NearbyMediaDevicesManager mNearbyMediaDevicesManager = mock( @@ -130,7 +131,7 @@ public class MediaOutputDialogTest extends SysuiTestCase { mMediaOutputController = new MediaOutputController(mContext, TEST_PACKAGE, mMediaSessionManager, mLocalBluetoothManager, mStarter, - mNotifCollection, mDialogLaunchAnimator, + mNotifCollection, mDialogTransitionAnimator, mNearbyMediaDevicesManager, mAudioManager, mPowerExemptionManager, mKeyguardManager, mFlags, mUserTracker); mMediaOutputController.mLocalMediaManager = mLocalMediaManager; @@ -379,7 +380,7 @@ public class MediaOutputDialogTest extends SysuiTestCase { }); verify(mockMediaOutputController).releaseSession(); - verify(mDialogLaunchAnimator).disableAllCurrentDialogsExitAnimations(); + verify(mDialogTransitionAnimator).disableAllCurrentDialogsExitAnimations(); } @Test @@ -399,7 +400,7 @@ public class MediaOutputDialogTest extends SysuiTestCase { false, mBroadcastSender, controller, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mUiEventLogger, true); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java index 1a303b08b396..4547bffaccf0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java @@ -51,15 +51,13 @@ import com.android.internal.logging.UiEventLogger; import com.android.internal.messages.nano.SystemMessageProto.SystemMessage; import com.android.settingslib.fuelgauge.BatterySaverUtils; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastSender; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.phone.SystemUIDialog; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.util.NotificationChannels; -import com.android.systemui.util.settings.FakeGlobalSettings; -import com.android.systemui.util.settings.GlobalSettings; import org.junit.Before; import org.junit.Test; @@ -83,7 +81,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { @Mock private BatteryController mBatteryController; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private UiEventLogger mUiEventLogger; @Mock @@ -123,7 +121,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { starter, broadcastSender, () -> mBatteryController, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mUiEventLogger, mUserTracker, mSystemUIDialogFactory); @@ -244,7 +242,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { mReceiver.onReceive(mContext, intent); - verify(mDialogLaunchAnimator).showFromView(any(), eq(mView), any()); + verify(mDialogTransitionAnimator).showFromView(any(), eq(mView), any()); mPowerNotificationWarnings.getSaverConfirmationDialog().dismiss(); } @@ -260,7 +258,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { mReceiver.onReceive(mContext, intent); - verify(mDialogLaunchAnimator, never()).showFromView(any(), any()); + verify(mDialogTransitionAnimator, never()).showFromView(any(), any()); verify(mPowerNotificationWarnings.getSaverConfirmationDialog()).show(); mPowerNotificationWarnings.getSaverConfirmationDialog().dismiss(); @@ -275,7 +273,7 @@ public class PowerNotificationWarningsTest extends SysuiTestCase { mReceiver.onReceive(mContext, intent); - verify(mDialogLaunchAnimator, never()).showFromView(any(), any()); + verify(mDialogTransitionAnimator, never()).showFromView(any(), any()); verify(mPowerNotificationWarnings.getSaverConfirmationDialog()).show(); mPowerNotificationWarnings.getSaverConfirmationDialog().dismiss(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogControllerV2Test.kt b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogControllerV2Test.kt index 0636831c7c66..59a6811dd395 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogControllerV2Test.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogControllerV2Test.kt @@ -34,7 +34,7 @@ import android.widget.LinearLayout import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.appops.AppOpsController import com.android.systemui.plugins.ActivityStarter import com.android.systemui.privacy.logging.PrivacyLogger @@ -97,7 +97,7 @@ class PrivacyDialogControllerV2Test : SysuiTestCase() { @Captor private lateinit var activityStartedCaptor: ArgumentCaptor<ActivityStarter.Callback> @Captor private lateinit var intentCaptor: ArgumentCaptor<Intent> @Mock private lateinit var uiEventLogger: UiEventLogger - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator private val backgroundExecutor = FakeExecutor(FakeSystemClock()) private val uiExecutor = FakeExecutor(FakeSystemClock()) @@ -145,7 +145,7 @@ class PrivacyDialogControllerV2Test : SysuiTestCase() { keyguardStateController, appOpsController, uiEventLogger, - dialogLaunchAnimator, + mDialogTransitionAnimator, dialogProvider ) } @@ -197,7 +197,7 @@ class PrivacyDialogControllerV2Test : SysuiTestCase() { controller.showDialog(context) exhaustExecutors() - verify(dialogLaunchAnimator, never()).show(any(), any(), anyBoolean()) + verify(mDialogTransitionAnimator, never()).show(any(), any(), anyBoolean()) verify(dialog).show() } @@ -212,7 +212,7 @@ class PrivacyDialogControllerV2Test : SysuiTestCase() { controller.showDialog(context, view) exhaustExecutors() - verify(dialogLaunchAnimator).show(eq(dialog), any(), anyBoolean()) + verify(mDialogTransitionAnimator).show(eq(dialog), any(), anyBoolean()) verify(dialog, never()).show() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java index 698868d67071..d39a6352bf70 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/FgsManagerControllerTest.java @@ -50,7 +50,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.dump.DumpManager; import com.android.systemui.settings.UserTracker; @@ -92,7 +92,7 @@ public class FgsManagerControllerTest extends SysuiTestCase { @Mock UserTracker mUserTracker; @Mock - DialogLaunchAnimator mDialogLaunchAnimator; + DialogTransitionAnimator mDialogTransitionAnimator; @Mock BroadcastDispatcher mBroadcastDispatcher; @Mock @@ -330,7 +330,7 @@ public class FgsManagerControllerTest extends SysuiTestCase { mPackageManager, mUserTracker, mDeviceConfigProxyFake, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mBroadcastDispatcher, mDumpManager, mSystemUIDialogFactory @@ -357,7 +357,7 @@ public class FgsManagerControllerTest extends SysuiTestCase { mPackageManager, mUserTracker, mDeviceConfigProxyFake, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mBroadcastDispatcher, mDumpManager, mSystemUIDialogFactory @@ -464,7 +464,7 @@ public class FgsManagerControllerTest extends SysuiTestCase { mPackageManager, mUserTracker, mDeviceConfigProxyFake, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mBroadcastDispatcher, mDumpManager, mSystemUIDialogFactory diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java index fbf3724c1d38..718e302f8236 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java @@ -53,14 +53,14 @@ import android.widget.TextView; import androidx.annotation.Nullable; -import com.android.systemui.res.R; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.animation.Expandable; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.common.shared.model.Icon; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.qs.footer.domain.model.SecurityButtonConfig; +import com.android.systemui.res.R; import com.android.systemui.security.data.model.SecurityModel; import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.policy.SecurityController; @@ -104,7 +104,7 @@ public class QSSecurityFooterTest extends SysuiTestCase { @Mock private ActivityStarter mActivityStarter; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private BroadcastDispatcher mBroadcastDispatcher; @@ -123,7 +123,8 @@ public class QSSecurityFooterTest extends SysuiTestCase { when(mUserTracker.getUserInfo()).thenReturn(mock(UserInfo.class)); mFooterUtils = new QSSecurityFooterUtils(getContext(), getContext().getSystemService(DevicePolicyManager.class), mUserTracker, - mainHandler, mActivityStarter, mSecurityController, looper, mDialogLaunchAnimator); + mainHandler, mActivityStarter, mSecurityController, looper, + mDialogTransitionAnimator); when(mSecurityController.getDeviceOwnerComponentOnAnyUser()) .thenReturn(DEVICE_OWNER_COMPONENT); @@ -732,13 +733,13 @@ public class QSSecurityFooterTest extends SysuiTestCase { .thenReturn(DEVICE_OWNER_TYPE_FINANCED); Expandable expandable = mock(Expandable.class); - when(expandable.dialogLaunchController(any())).thenReturn( - mock(DialogLaunchAnimator.Controller.class)); + when(expandable.dialogTransitionController(any())).thenReturn( + mock(DialogTransitionAnimator.Controller.class)); mFooterUtils.showDeviceMonitoringDialog(getContext(), expandable); ArgumentCaptor<AlertDialog> dialogCaptor = ArgumentCaptor.forClass(AlertDialog.class); mTestableLooper.processAllMessages(); - verify(mDialogLaunchAnimator).show(dialogCaptor.capture(), any()); + verify(mDialogTransitionAnimator).show(dialogCaptor.capture(), any()); AlertDialog dialog = dialogCaptor.getValue(); dialog.create(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java index 4c5a2144941a..efbfb4f33795 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/CastTileTest.java @@ -41,7 +41,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.MetricsLogger; import com.android.keyguard.TestScopeProvider; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.plugins.ActivityStarter; @@ -101,7 +101,7 @@ public class CastTileTest extends SysuiTestCase { @Mock private QSLogger mQSLogger; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private QsEventLogger mUiEventLogger; @@ -505,7 +505,7 @@ public class CastTileTest extends SysuiTestCase { mKeyguard, mNetworkController, mHotspotController, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mConnectivityRepository, mJavaAdapter, mFeatureFlags @@ -548,7 +548,7 @@ public class CastTileTest extends SysuiTestCase { mKeyguard, mNetworkController, mHotspotController, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mConnectivityRepository, mJavaAdapter, mFeatureFlags diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt index c109a1e95f66..043ddf5b433a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DataSaverTileTest.kt @@ -21,9 +21,8 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.qs.QSTile @@ -32,6 +31,7 @@ import com.android.systemui.qs.QSHost import com.android.systemui.qs.QsEventLogger import com.android.systemui.qs.logging.QSLogger import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.res.R import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.policy.DataSaverController import com.android.systemui.util.mockito.whenever @@ -41,7 +41,6 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito import org.mockito.MockitoAnnotations @RunWith(AndroidTestingRunner::class) @@ -56,7 +55,7 @@ class DataSaverTileTest : SysuiTestCase() { @Mock private lateinit var statusBarStateController: StatusBarStateController @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var dataSaverController: DataSaverController - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var uiEventLogger: QsEventLogger @Mock private lateinit var systemUIDialogFactory: SystemUIDialog.Factory @Mock private lateinit var systemUIDialog: SystemUIDialog @@ -84,7 +83,7 @@ class DataSaverTileTest : SysuiTestCase() { activityStarter, mQsLogger, dataSaverController, - dialogLaunchAnimator, + mDialogTransitionAnimator, systemUIDialogFactory ) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DndTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DndTileTest.kt index 5dd297ca1bdc..cca1344424ac 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DndTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DndTileTest.kt @@ -31,7 +31,7 @@ import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger import com.android.systemui.res.R import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.qs.QSTile @@ -94,7 +94,7 @@ class DndTileTest : SysuiTestCase() { private lateinit var sharedPreferences: SharedPreferences @Mock - private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var hostDialog: Dialog @@ -133,7 +133,7 @@ class DndTileTest : SysuiTestCase() { zenModeController, sharedPreferences, secureSettings, - dialogLaunchAnimator + mDialogTransitionAnimator ) } @@ -191,7 +191,7 @@ class DndTileTest : SysuiTestCase() { tile.handleClick(view) testableLooper.processAllMessages() - verify(dialogLaunchAnimator).showFromView(any(), eq(view), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator).showFromView(any(), eq(view), nullable(), anyBoolean()) } @Test @@ -205,7 +205,8 @@ class DndTileTest : SysuiTestCase() { tile.handleClick(view) testableLooper.processAllMessages() - verify(dialogLaunchAnimator, never()).showFromView(any(), any(), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator, never()) + .showFromView(any(), any(), nullable(), anyBoolean()) } @Test diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt index 77964527eaf1..1f5ebfec1a56 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/FontScalingTileTest.kt @@ -25,7 +25,7 @@ import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger import com.android.systemui.SysuiTestCase import com.android.systemui.accessibility.fontscaling.FontScalingDialogDelegate -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -62,7 +62,7 @@ class FontScalingTileTest : SysuiTestCase() { @Mock private lateinit var statusBarStateController: StatusBarStateController @Mock private lateinit var activityStarter: ActivityStarter @Mock private lateinit var qsLogger: QSLogger - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var uiEventLogger: QsEventLogger @Mock private lateinit var keyguardStateController: KeyguardStateController @Mock private lateinit var fontScalingDialogDelegate: FontScalingDialogDelegate @@ -96,7 +96,7 @@ class FontScalingTileTest : SysuiTestCase() { activityStarter, qsLogger, keyguardStateController, - dialogLaunchAnimator, + mDialogTransitionAnimator, { fontScalingDialogDelegate }, ) fontScalingTile.initialize() @@ -132,7 +132,7 @@ class FontScalingTileTest : SysuiTestCase() { eq(false) ) argumentCaptor.value.run() - verify(dialogLaunchAnimator).showFromView(any(), eq(view), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator).showFromView(any(), eq(view), nullable(), anyBoolean()) } @Test @@ -151,7 +151,7 @@ class FontScalingTileTest : SysuiTestCase() { eq(false) ) argumentCaptor.value.run() - verify(dialogLaunchAnimator, never()) + verify(mDialogTransitionAnimator, never()) .showFromView(any(), eq(view), nullable(), anyBoolean()) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt index 1ed8c3cdf0ba..3122edb8f50e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/RecordIssueTileTest.kt @@ -23,7 +23,7 @@ import android.testing.TestableLooper import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.statusbar.StatusBarStateController @@ -65,7 +65,7 @@ class RecordIssueTileTest : SysuiTestCase() { @Mock private lateinit var qsLogger: QSLogger @Mock private lateinit var keyguardDismissUtil: KeyguardDismissUtil @Mock private lateinit var keyguardStateController: KeyguardStateController - @Mock private lateinit var dialogLauncherAnimator: DialogLaunchAnimator + @Mock private lateinit var dialogLauncherAnimator: DialogTransitionAnimator @Mock private lateinit var userContextProvider: UserContextProvider @Mock private lateinit var delegateFactory: RecordIssueDialogDelegate.Factory @Mock private lateinit var dialogDelegate: RecordIssueDialogDelegate diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java index c6d156f51905..507fb868f5a4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java @@ -38,7 +38,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.MetricsLogger; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.classifier.FalsingManagerFake; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger; @@ -88,7 +88,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { @Mock private KeyguardStateController mKeyguardStateController; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private PanelInteractor mPanelInteractor; @Mock @@ -126,7 +126,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { mController, mKeyguardDismissUtil, mKeyguardStateController, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mPanelInteractor, mMediaProjectionMetricsLogger, mUserContextProvider @@ -161,12 +161,13 @@ public class ScreenRecordTileTest extends SysuiTestCase { ArgumentCaptor<Runnable> onStartRecordingClicked = ArgumentCaptor.forClass(Runnable.class); verify(mController).createScreenRecordDialog(any(), eq(mFeatureFlags), - eq(mDialogLaunchAnimator), eq(mActivityStarter), onStartRecordingClicked.capture()); + eq(mDialogTransitionAnimator), eq(mActivityStarter), + onStartRecordingClicked.capture()); // When starting the recording, we collapse the shade and disable the dialog animation. assertNotNull(onStartRecordingClicked.getValue()); onStartRecordingClicked.getValue().run(); - verify(mDialogLaunchAnimator).disableAllCurrentDialogsExitAnimations(); + verify(mDialogTransitionAnimator).disableAllCurrentDialogsExitAnimations(); verify(mPanelInteractor).collapsePanels(); } @@ -304,7 +305,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { mTestableLooper.processAllMessages(); verify(mController).createScreenRecordDialog(any(), eq(mFeatureFlags), - eq(mDialogLaunchAnimator), eq(mActivityStarter), any()); + eq(mDialogTransitionAnimator), eq(mActivityStarter), any()); var onDismissAction = ArgumentCaptor.forClass(ActivityStarter.OnDismissAction.class); verify(mKeyguardDismissUtil).executeWhenUnlocked( onDismissAction.capture(), anyBoolean(), anyBoolean()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java index c0ef50fa9072..077ec4b7102c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogControllerTest.java @@ -64,7 +64,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; import com.android.settingslib.wifi.WifiUtils; import com.android.settingslib.wifi.dpp.WifiDppIntentHelper; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; @@ -172,7 +172,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { @Mock private LocationController mLocationController; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private View mDialogLaunchView; @Mock @@ -227,7 +227,7 @@ public class InternetDialogControllerTest extends SysuiTestCase { mConnectivityManager, mHandler, mExecutor, mBroadcastDispatcher, mock(KeyguardUpdateMonitor.class), mGlobalSettings, mKeyguardStateController, mWindowManager, mToastFactory, mWorkerHandler, mCarrierConfigTracker, - mLocationController, mDialogLaunchAnimator, mWifiStateWorker, mFlags); + mLocationController, mDialogTransitionAnimator, mWifiStateWorker, mFlags); mSubscriptionManager.addOnSubscriptionsChangedListener(mExecutor, mInternetDialogController.mOnSubscriptionsChangedListener); mInternetDialogController.onStart(mInternetDialogCallback, true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java index 916bb79d97b3..c9e6274e5660 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java @@ -32,7 +32,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito; import com.android.internal.logging.UiEventLogger; import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.res.R; import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.concurrency.FakeExecutor; @@ -77,7 +77,7 @@ public class InternetDialogTest extends SysuiTestCase { @Mock private KeyguardStateController mKeyguard; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; private FakeExecutor mBgExecutor = new FakeExecutor(new FakeSystemClock()); private InternetDialog mInternetDialog; @@ -124,7 +124,7 @@ public class InternetDialogTest extends SysuiTestCase { private void createInternetDialog() { mInternetDialog = new InternetDialog(mContext, mock(InternetDialogFactory.class), mInternetDialogController, true, true, true, mock(UiEventLogger.class), - mDialogLaunchAnimator, mHandler, + mDialogTransitionAnimator, mHandler, mBgExecutor, mKeyguard); mInternetDialog.mAdapter = mInternetAdapter; mInternetDialog.mConnectedWifiEntry = mInternetWifiEntry; @@ -522,7 +522,7 @@ public class InternetDialogTest extends SysuiTestCase { primaryLayout.performClick(); ArgumentCaptor<AlertDialog> dialogArgumentCaptor = ArgumentCaptor.forClass(AlertDialog.class); - verify(mDialogLaunchAnimator).showFromDialog(dialogArgumentCaptor.capture(), + verify(mDialogTransitionAnimator).showFromDialog(dialogArgumentCaptor.capture(), eq(mInternetDialog), eq(null), eq(false)); AlertDialog dialog = dialogArgumentCaptor.getValue(); dialog.show(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt index 9563cebf898b..98ac17b96c16 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/bluetooth/BluetoothTileDialogViewModelTest.kt @@ -25,7 +25,7 @@ import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger import com.android.settingslib.bluetooth.CachedBluetoothDevice import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.plugins.ActivityStarter import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.any @@ -69,7 +69,7 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { @Mock private lateinit var activityStarter: ActivityStarter - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var cachedBluetoothDevice: CachedBluetoothDevice @@ -94,7 +94,7 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { BluetoothTileDialogViewModel( deviceItemInteractor, bluetoothStateInteractor, - dialogLaunchAnimator, + mDialogTransitionAnimator, activityStarter, fakeSystemClock, uiEventLogger, @@ -117,7 +117,7 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { testScope.runTest { bluetoothTileDialogViewModel.showDialog(context, null) - verify(dialogLaunchAnimator, never()).showFromView(any(), any(), any(), any()) + verify(mDialogTransitionAnimator, never()).showFromView(any(), any(), any(), any()) verify(uiEventLogger).log(BluetoothTileDialogUiEvent.BLUETOOTH_TILE_DIALOG_SHOWN) } } @@ -127,7 +127,7 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { testScope.runTest { bluetoothTileDialogViewModel.showDialog(mContext, LinearLayout(mContext)) - verify(dialogLaunchAnimator).showFromView(any(), any(), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator).showFromView(any(), any(), nullable(), anyBoolean()) } } @@ -137,7 +137,8 @@ class BluetoothTileDialogViewModelTest : SysuiTestCase() { backgroundExecutor.execute { bluetoothTileDialogViewModel.showDialog(mContext, LinearLayout(mContext)) - verify(dialogLaunchAnimator).showFromView(any(), any(), nullable(), anyBoolean()) + verify(mDialogTransitionAnimator) + .showFromView(any(), any(), nullable(), anyBoolean()) } } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt index 945490f1983d..e48d96b3763f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/user/UserSwitchDialogControllerTest.kt @@ -24,7 +24,7 @@ import android.widget.Button import androidx.test.filters.SmallTest import com.android.internal.logging.UiEventLogger import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.FalsingManager @@ -71,7 +71,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { @Mock private lateinit var neutralButton: Button @Mock - private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator @Mock private lateinit var uiEventLogger: UiEventLogger @Captor @@ -90,7 +90,7 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { { userDetailViewAdapter }, activityStarter, falsingManager, - dialogLaunchAnimator, + mDialogTransitionAnimator, uiEventLogger, dialogFactory ) @@ -98,10 +98,10 @@ class UserSwitchDialogControllerTest : SysuiTestCase() { @Test fun showDialog_callsDialogShow() { - val launchController = mock<DialogLaunchAnimator.Controller>() - `when`(launchExpandable.dialogLaunchController(any())).thenReturn(launchController) + val launchController = mock<DialogTransitionAnimator.Controller>() + `when`(launchExpandable.dialogTransitionController(any())).thenReturn(launchController) controller.showDialog(context, launchExpandable) - verify(dialogLaunchAnimator).show(eq(dialog), eq(launchController), anyBoolean()) + verify(mDialogTransitionAnimator).show(eq(dialog), eq(launchController), anyBoolean()) verify(uiEventLogger).log(QSUserSwitcherEvent.QS_USER_DETAIL_OPEN) } 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 86ab01ca9e2a..7b285abe83ce 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/recordissue/RecordIssueDialogDelegateTest.kt @@ -26,7 +26,7 @@ import android.widget.Button import android.widget.Switch import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.flags.FeatureFlagsClassic import com.android.systemui.flags.Flags @@ -80,7 +80,7 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() { @Mock private lateinit var broadcastDispatcher: BroadcastDispatcher @Mock private lateinit var bgExecutor: Executor @Mock private lateinit var mainExecutor: Executor - @Mock private lateinit var dialogLaunchAnimator: DialogLaunchAnimator + @Mock private lateinit var mDialogTransitionAnimator: DialogTransitionAnimator private lateinit var dialog: SystemUIDialog private lateinit var factory: SystemUIDialog.Factory @@ -108,7 +108,7 @@ class RecordIssueDialogDelegateTest : SysuiTestCase() { systemUIDialogManager, sysuiState, broadcastDispatcher, - dialogLaunchAnimator + mDialogTransitionAnimator ) ) 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 0ba99f2d24fb..6cbe8c9a939b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java @@ -41,7 +41,7 @@ import androidx.test.filters.SmallTest; import com.android.systemui.Dependency; import com.android.systemui.SysuiTestCase; -import com.android.systemui.animation.DialogLaunchAnimator; +import com.android.systemui.animation.DialogTransitionAnimator; import com.android.systemui.broadcast.BroadcastDispatcher; import com.android.systemui.flags.FakeFeatureFlags; import com.android.systemui.flags.Flags; @@ -88,7 +88,7 @@ public class RecordingControllerTest extends SysuiTestCase { @Mock private ScreenCaptureDevicePolicyResolver mDevicePolicyResolver; @Mock - private DialogLaunchAnimator mDialogLaunchAnimator; + private DialogTransitionAnimator mDialogTransitionAnimator; @Mock private ActivityStarter mActivityStarter; @Mock @@ -115,7 +115,7 @@ public class RecordingControllerTest extends SysuiTestCase { Dependency.get(SystemUIDialogManager.class), Dependency.get(SysUiState.class), Dependency.get(BroadcastDispatcher.class), - Dependency.get(DialogLaunchAnimator.class) + Dependency.get(DialogTransitionAnimator.class) ); mFeatureFlags = new FakeFeatureFlags(); @@ -238,7 +238,7 @@ public class RecordingControllerTest extends SysuiTestCase { mController.createScreenRecordDialog( mContext, mFeatureFlags, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); @@ -253,7 +253,7 @@ public class RecordingControllerTest extends SysuiTestCase { mFeatureFlags.set(Flags.WM_ENABLE_PARTIAL_SCREEN_SHARING_ENTERPRISE_POLICIES, false); Dialog dialog = mController.createScreenRecordDialog(mContext, mFeatureFlags, - mDialogLaunchAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); + mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); assertThat(dialog).isInstanceOf(ScreenRecordDialog.class); } @@ -265,7 +265,7 @@ public class RecordingControllerTest extends SysuiTestCase { when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(true); Dialog dialog = mController.createScreenRecordDialog(mContext, mFeatureFlags, - mDialogLaunchAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); + mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); assertThat(dialog).isInstanceOf(ScreenCaptureDisabledDialog.class); } @@ -280,7 +280,7 @@ public class RecordingControllerTest extends SysuiTestCase { mController.createScreenRecordDialog( mContext, mFeatureFlags, - mDialogLaunchAnimator, + mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); @@ -296,7 +296,7 @@ public class RecordingControllerTest extends SysuiTestCase { when(mDevicePolicyResolver.isScreenCaptureCompletelyDisabled((any()))).thenReturn(false); mController.createScreenRecordDialog(mContext, mFeatureFlags, - mDialogLaunchAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); + mDialogTransitionAnimator, mActivityStarter, /* onStartRecordingClicked= */ null); verify(mMediaProjectionMetricsLogger) .notifyProjectionInitiated( @@ -314,13 +314,13 @@ public class RecordingControllerTest extends SysuiTestCase { SystemUIDialogManager systemUIDialogManager, SysUiState sysUiState, BroadcastDispatcher broadcastDispatcher, - DialogLaunchAnimator dialogLaunchAnimator) { + DialogTransitionAnimator dialogTransitionAnimator) { super( context, systemUIDialogManager, sysUiState, broadcastDispatcher, - dialogLaunchAnimator); + dialogTransitionAnimator); } @Override 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 23995364f9e5..90ced92c7f30 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegateTest.kt @@ -25,7 +25,7 @@ import android.widget.Spinner import androidx.test.filters.SmallTest import com.android.systemui.Dependency import com.android.systemui.SysuiTestCase -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flags @@ -77,7 +77,7 @@ class ScreenRecordPermissionDialogDelegateTest : SysuiTestCase() { Dependency.get(SystemUIDialogManager::class.java), Dependency.get(SysUiState::class.java), Dependency.get(BroadcastDispatcher::class.java), - Dependency.get(DialogLaunchAnimator::class.java), + Dependency.get(DialogTransitionAnimator::class.java), ) val delegate = ScreenRecordPermissionDialogDelegate( diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestDependency.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestDependency.kt index 364d3b236ef5..7bb4218daac6 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestDependency.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestDependency.kt @@ -3,8 +3,8 @@ package com.android.systemui import android.annotation.SuppressLint import android.os.Looper import com.android.keyguard.KeyguardUpdateMonitor -import com.android.systemui.animation.DialogLaunchAnimator -import com.android.systemui.animation.fakeDialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator +import com.android.systemui.animation.fakeDialogTransitionAnimator import com.android.systemui.broadcast.BroadcastDispatcher import com.android.systemui.broadcast.FakeBroadcastDispatcher import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger @@ -40,8 +40,8 @@ class SysuiTestDependency( // step; any tests that rely on it are already being excluded under Ravenwood if (!SysuiTestCase.isRavenwoodTest()) { dependency.injectTestDependency( - DialogLaunchAnimator::class.java, - fakeDialogLaunchAnimator() + DialogTransitionAnimator::class.java, + fakeDialogTransitionAnimator() ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt index b18859dc4b25..3f55f42b8d85 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/TestMocksModule.kt @@ -26,7 +26,7 @@ import com.android.internal.statusbar.IStatusBarService import com.android.keyguard.KeyguardSecurityModel import com.android.keyguard.KeyguardUpdateMonitor import com.android.keyguard.KeyguardViewController -import com.android.systemui.animation.DialogLaunchAnimator +import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.communal.domain.interactor.CommunalInteractor import com.android.systemui.demomode.DemoModeController import com.android.systemui.dump.DumpManager @@ -112,7 +112,7 @@ data class TestMocksModule( @get:Provides val statusBarWindowController: StatusBarWindowController = mock(), @get:Provides val wakefulnessLifecycle: WakefulnessLifecycle = mock(), @get:Provides val keyguardViewController: KeyguardViewController = mock(), - @get:Provides val dialogLaunchAnimator: DialogLaunchAnimator = mock(), + @get:Provides val dialogTransitionAnimator: DialogTransitionAnimator = mock(), @get:Provides val sysuiState: SysUiState = mock(), @get:Provides val unfoldTransitionProgressProvider: Optional<UnfoldTransitionProgressProvider> = diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/animation/FakeDialogLaunchAnimator.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/animation/FakeDialogTransitionAnimator.kt index 5b84a418181d..7c5bb1278cba 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/animation/FakeDialogLaunchAnimator.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/animation/FakeDialogTransitionAnimator.kt @@ -17,15 +17,15 @@ package com.android.systemui.animation import com.android.internal.jank.InteractionJankMonitor import org.mockito.Mockito.mock -/** A [DialogLaunchAnimator] to be used in tests. */ +/** A [DialogTransitionAnimator] to be used in tests. */ @JvmOverloads -fun fakeDialogLaunchAnimator( +fun fakeDialogTransitionAnimator( isUnlocked: Boolean = true, isShowingAlternateAuthOnUnlock: Boolean = false, interactionJankMonitor: InteractionJankMonitor = mock(InteractionJankMonitor::class.java), isPredictiveBackQsDialogAnim: Boolean = false, -): DialogLaunchAnimator { - return DialogLaunchAnimator( +): DialogTransitionAnimator { + return DialogTransitionAnimator( callback = FakeCallback( isUnlocked = isUnlocked, @@ -45,7 +45,7 @@ private class FakeCallback( private val isDreaming: Boolean = false, private val isUnlocked: Boolean = true, private val isShowingAlternateAuthOnUnlock: Boolean = false, -) : DialogLaunchAnimator.Callback { +) : DialogTransitionAnimator.Callback { override fun isDreaming(): Boolean = isDreaming override fun isUnlocked(): Boolean = isUnlocked override fun isShowingAlternateAuthOnUnlock() = isShowingAlternateAuthOnUnlock |