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

Commit 2d7cf7d4 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into aosp-main-future

parents b1ab8e9d 562eabae

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)



        getLifecycle().addObserver(

        lifecycle.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)



        getLifecycle().addObserver(

        lifecycle.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)



        getLifecycle().addObserver(

        lifecycle.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
@@ -72,7 +72,7 @@ open class ControlsActivity @Inject constructor( 


        setContentView(R.layout.controls_fullscreen)



        getLifecycle().addObserver(

        lifecycle.addObserver(

            ControlsAnimations.observerForAnimations(

                requireViewById(R.id.control_detail_root),

                window,

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

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

    val registry: LifecycleRegistry = LifecycleRegistry(this)



    override fun getLifecycle(): Lifecycle {

    override val lifecycle: Lifecycle

        get() {

            return registry

        }

}