Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8eb0329497dc6f805a4fee22dafab25517d31a6d
This commit is contained in:
Matt Pietal
2021-07-22 17:59:03 +00:00
committed by Automerger Merge Worker
parent 15bda2adbb 0c89ea5d0f
commit ab7ebe718a
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,16 +64,12 @@ class ControlsActivity @Inject constructor(
} }
} }
override fun onStart() { override fun onResume() {
super.onStart() super.onResume()
parent = requireViewById<ViewGroup>(R.id.global_actions_controls) parent = requireViewById<ViewGroup>(R.id.global_actions_controls)
parent.alpha = 0f parent.alpha = 0f
uiController.show(parent, { finish() }, this) uiController.show(parent, { finish() }, this)
}
override fun onResume() {
super.onResume()
ControlsAnimations.enterAnimation(parent).start() ControlsAnimations.enterAnimation(parent).start()
} }
@@ -82,8 +78,8 @@ class ControlsActivity @Inject constructor(
finish() finish()
} }
override fun onStop() { override fun onPause() {
super.onStop() super.onPause()
uiController.hide() uiController.hide()
} }