Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f

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

Change-Id: I8eb0329497dc6f805a4fee22dafab25517d31a6d

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

@@ -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()
     }