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

Commit 67ce9ee5 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: Ic33f7f7e7debc05753068a5f245972297c82c686
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5988e3ef 7fe1fcde

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

+0 −1
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ open class ControlsProviderSelectorActivity @Inject constructor( 
                    )

                }

                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
@@ -145,7 +145,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