Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7adc684 authored by Brandon Liu's avatar Brandon Liu
Browse files

Revert "Lifecycle has to use kotlin syntax" 

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
parent 2f0b9d45

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayLifecycleOwner.kt

+3 −4
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ import javax.inject.Inject 
class DreamOverlayLifecycleOwner @Inject constructor() : LifecycleOwner {

    val registry: LifecycleRegistry = LifecycleRegistry(this)



    override val lifecycle: Lifecycle

        get() {

    override fun getLifecycle(): Lifecycle {

        return registry

    }

}