summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2022-03-22 10:23:55 -0400
committer Matt Pietal <mpietal@google.com> 2022-03-22 10:23:55 -0400
commit02f723b7d2f6842b777148c924b45ba456f7f930 (patch)
tree45918b563ab17b4011d936289089353a2883f745
parente7ed33a57719f402d3bc6357ffeeebd79b6ad42c (diff)
Fix TaskView over lockscreen
When launching the TaskView with embedded activity over lockscreen, the ControlsActivity is being issued onPause()/onResume() calls. Previously, these would trigger show and hide animations to run, which means it would also immediately hide the TaskView. Move these to onStart()/onStop() Fixes: 226117798 Test: ControlsMockApp with test activities Change-Id: If888859ed733a4b683d164d96d0893ddb1e8a106
-rw-r--r--packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt8
1 files changed, 4 insertions, 4 deletions
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 46a03e809b06..49f758405fbd 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsActivity.kt
@@ -77,8 +77,8 @@ class ControlsActivity @Inject constructor(
initBroadcastReceiver()
}
- override fun onResume() {
- super.onResume()
+ override fun onStart() {
+ super.onStart()
parent = requireViewById<ViewGroup>(R.id.global_actions_controls)
parent.alpha = 0f
@@ -91,8 +91,8 @@ class ControlsActivity @Inject constructor(
finish()
}
- override fun onPause() {
- super.onPause()
+ override fun onStop() {
+ super.onStop()
uiController.hide()
}