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

Commit 059ec10b authored by Anton Potapov's avatar Anton Potapov Committed by Automerger Merge Worker
Browse files

Merge "Remove ControlsProviderSelectorActivity finish on... 

Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde

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



Change-Id: Ia56a2946b60f3e1a2c77a6895e1f534a6793b66c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 493a73a9 7fe1fcde

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

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ open class ControlsProviderSelectorActivity @Inject constructor( 
                    putExtra(ControlsFavoritingActivity.EXTRA_FROM_PROVIDER_SELECTOR, true)

                }

                startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(this).toBundle())

                animateExitAndFinish()

            }

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -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