Merge "Fix multiple control providers" into sc-dev (0c89ea5d) · Commits · e / os / android_frameworks_base

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