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

Commit bddc6957 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

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

parents e306bdea 416d4149
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -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,
+1 −1
Original line number Original line Diff line number Diff line
@@ -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,
+1 −1
Original line number Original line Diff line number Diff line
@@ -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,
+1 −1
Original line number Original line Diff line number Diff line
@@ -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,
+4 −3
Original line number Original line Diff line number Diff line
@@ -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
        get() {
            return registry
            return registry
        }
        }
}
}
Loading