Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-05-30 18:06:19 +00:00
committed by Android (Google) Code Review
parent d43e5a5ff0 442c1002a8
commit 7fe1fcde3a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt
View File

@@ -214,7 +214,6 @@ open class ControlsProviderSelectorActivity @Inject constructor(
putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true) putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true)
} }
startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle()) startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle())
animateExitAndFinish()
} }
} }
} }

2
packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt
View File

@@ -144,7 +144,7 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() {
assertThat(activityRule.activity.lastStartedActivity?.component?.className) assertThat(activityRule.activity.lastStartedActivity?.component?.className)
.isEqualTo(ControlsFavoritingActivity::class.java.name) .isEqualTo(ControlsFavoritingActivity::class.java.name)
assertThat(activityRule.activity.triedToFinish).isTrue() assertThat(activityRule.activity.triedToFinish).isFalse()
} }
@Test @Test