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

Revert "Lifecycle has to use kotlin syntax"

Browse Source 
Revert submission 22208109-lifecycle_9778738

Reason for revert: <ACA identified this is the culprit of build failure b/281883862>

Reverted changes: /q/submissionid:22208109-lifecycle_9778738

Change-Id: I9a5249529dd9b7a8d4c9c59a61b3a780371d7e6b
This commit is contained in:
Brandon Liu
2023-05-10 23:04:30 +00:00
parent 2f0b9d45ee
commit b7adc6843c
6 changed files with 10 additions and 12 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() {
setContentView(R.layout.controls_management)
lifecycle.addObserver(
getLifecycle().addObserver(
ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root),
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() {
setContentView(R.layout.controls_management)
lifecycle.addObserver(
getLifecycle().addObserver(
ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root),
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)
lifecycle.addObserver(
getLifecycle().addObserver(
ControlsAnimations.observerForAnimations(
requireViewById<ViewGroup>(R.id.controls_management_root),
window,

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

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

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

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

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

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