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

Commit 94960631 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d am: 3786bd80 

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

Change-Id: I2929f08d6276fea4c17b9873138c5bd4cfd6d3df
parents ba224c24 3786bd80

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt

+4 −8
Original line number Diff line number Diff line
@@ -64,16 +64,12 @@ class ControlsActivity @Inject constructor( 
        }

    }



    override fun onStart() {

        super.onStart()

    override fun onResume() {

        super.onResume()



        parent = requireViewById<ViewGroup>(R.id.global_actions_controls)

        parent.alpha = 0f

        uiController.show(parent, { finish() }, this)

    }



    override fun onResume() {

        super.onResume()



        ControlsAnimations.enterAnimation(parent).start()

    }
@@ -82,8 +78,8 @@ class ControlsActivity @Inject constructor( 
        finish()

    }



    override fun onStop() {

        super.onStop()

    override fun onPause() {

        super.onPause()



        uiController.hide()

    }