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

Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-qpr-dev

Browse Source
This commit is contained in:
Anvesh Renikindi
2023-06-27 17:04:42 +00:00
committed by Android (Google) Code Review
parent b95485ff17 08e2fd0c4a
commit 416d4149c9
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt
View File

@@ -154,7 +154,7 @@ open class ControlsEditingActivity @Inject constructor(
private fun bindViews() { private fun bindViews() {
setContentView(R.layout.controls_management) setContentView(R.layout.controls_management)
getLifecycle().addObserver( lifecycle.addObserver(
ControlsAnimations.observerForAnimations( ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root), requireViewById<ViewGroup>(R.id.controls_management_root),
window, window,

2
packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt
View File

@@ -268,7 +268,7 @@ open class ControlsFavoritingActivity @Inject constructor(
private fun bindViews() { private fun bindViews() {
setContentView(R.layout.controls_management) setContentView(R.layout.controls_management)
getLifecycle().addObserver( lifecycle.addObserver(
ControlsAnimations.observerForAnimations( ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root), requireViewById<ViewGroup>(R.id.controls_management_root),
window, window,

2
packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt
View File

@@ -91,7 +91,7 @@ open class ControlsProviderSelectorActivity @Inject constructor(
setContentView(R.layout.controls_management) setContentView(R.layout.controls_management)
getLifecycle().addObserver( lifecycle.addObserver(
ControlsAnimations.observerForAnimations( ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root), requireViewById<ViewGroup>(R.id.controls_management_root),
window, window,

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

@@ -72,7 +72,7 @@ open class ControlsActivity @Inject constructor(
setContentView(R.layout.controls_fullscreen) setContentView(R.layout.controls_fullscreen)
getLifecycle().addObserver( lifecycle.addObserver(
ControlsAnimations.observerForAnimations( ControlsAnimations.observerForAnimations(
requireViewById(R.id.control_detail_root), requireViewById(R.id.control_detail_root),
window, window,

7
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayLifecycleOwner.kt
View File

@@ -28,7 +28,8 @@ import javax.inject.Inject
class DreamOverlayLifecycleOwner @Inject constructor() : LifecycleOwner { class DreamOverlayLifecycleOwner @Inject constructor() : LifecycleOwner {
val registry: LifecycleRegistry = LifecycleRegistry(this) val registry: LifecycleRegistry = LifecycleRegistry(this)
override fun getLifecycle(): Lifecycle { override val lifecycle: Lifecycle
return registry get() {
} return registry
}
} }

7
packages/SystemUI/src/com/android/systemui/lifecycle/RepeatWhenAttached.kt
View File

@@ -167,9 +167,10 @@ class ViewLifecycleOwner(
registry.currentState = Lifecycle.State.DESTROYED registry.currentState = Lifecycle.State.DESTROYED
} }
override fun getLifecycle(): Lifecycle { override val lifecycle: Lifecycle
return registry get() {
} return registry
}
private fun updateState() { private fun updateState() {
registry.currentState = registry.currentState =