commit 0c89ea5d0f69932055c9697cacead39544df29c3
author Matt Pietal <mpietal@google.com> Thu Jul 22 17:35:32 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 17:35:32 2021 +0000
tree e6ccb125a2e44f5a12016ad3624e052bd3fd55ee
parent c5d6a8e70a6ed85ed2e18012b8b78fc26098d69c
parent 939a99cd4d8c536b935585444c2f2296fa563247

Merge "Fix multiple control providers" into sc-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
index c241c08..4104e31 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
@@ -64,16 +64,12 @@
         }
     }
 
-    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 @@
         finish()
     }
 
-    override fun onStop() {
-        super.onStop()
+    override fun onPause() {
+        super.onPause()
 
         uiController.hide()
     }