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 am: 7fe1fcde3a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23428200

Change-Id: Ia56a2946b60f3e1a2c77a6895e1f534a6793b66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Potapov
2023-05-30 19:03:12 +00:00
committed by Automerger Merge Worker
parent 493a73a980 7fe1fcde3a
commit 059ec10ba0
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)
}
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)
.isEqualTo(ControlsFavoritingActivity::class.java.name)
assertThat(activityRule.activity.triedToFinish).isTrue()
assertThat(activityRule.activity.triedToFinish).isFalse()
}
@Test