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

Commit b46351ca authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Merge changes from topics "power-repo-interactor",... 

Merge changes from topics "power-repo-interactor", "user-switcher-domain-layer" into tm-qpr-dev am: b76e7b1a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19805593



Change-Id: Iccb59d2584a527b761082d53337f13071ec727a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae1d09e7 b76e7b1a

packages/SystemUI/src/com/android/systemui/common/shared/model/Text.kt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.common.shared.model



import android.annotation.StringRes



/**

 * Models a text, that can either be already [loaded][Text.Loaded] or be a [reference]

 * [Text.Resource] to a resource.

 */

sealed class Text {

    data class Loaded(

        val text: String?,

    ) : Text()



    data class Resource(

        @StringRes val res: Int,

    ) : Text()

}

packages/SystemUI/src/com/android/systemui/common/ui/binder/TextViewBinder.kt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.common.ui.binder



import android.widget.TextView

import com.android.systemui.common.shared.model.Text



object TextViewBinder {

    fun bind(view: TextView, viewModel: Text) {

        view.text =

            when (viewModel) {

                is Text.Resource -> view.context.getString(viewModel.res)

                is Text.Loaded -> viewModel.text

            }

    }

}

packages/SystemUI/src/com/android/systemui/power/dagger/PowerModule.java

+6 −1
Original line number Diff line number Diff line
@@ -20,13 +20,18 @@ import com.android.systemui.power.EnhancedEstimates; 
import com.android.systemui.power.EnhancedEstimatesImpl;

import com.android.systemui.power.PowerNotificationWarnings;

import com.android.systemui.power.PowerUI;

import com.android.systemui.power.data.repository.PowerRepositoryModule;



import dagger.Binds;

import dagger.Module;





/** Dagger Module for code in the power package. */

@Module

@Module(

        includes = {

                PowerRepositoryModule.class,

        }

)

public interface PowerModule {

    /** */

    @Binds

packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepository.kt

0 → 100644
+74 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.power.data.repository



import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent

import android.content.IntentFilter

import android.os.PowerManager

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLogging

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.dagger.SysUISingleton

import javax.inject.Inject

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.Flow



/** Defines interface for classes that act as source of truth for power-related data. */

interface PowerRepository {

    /** Whether the device is interactive. Starts with the current state. */

    val isInteractive: Flow<Boolean>

}



@SysUISingleton

class PowerRepositoryImpl

@Inject

constructor(

    manager: PowerManager,

    dispatcher: BroadcastDispatcher,

) : PowerRepository {



    override val isInteractive: Flow<Boolean> = conflatedCallbackFlow {

        fun send() {

            trySendWithFailureLogging(manager.isInteractive, TAG)

        }



        val receiver =

            object : BroadcastReceiver() {

                override fun onReceive(context: Context?, intent: Intent?) {

                    send()

                }

            }



        dispatcher.registerReceiver(

            receiver,

            IntentFilter().apply {

                addAction(Intent.ACTION_SCREEN_ON)

                addAction(Intent.ACTION_SCREEN_OFF)

            },

        )

        send()



        awaitClose { dispatcher.unregisterReceiver(receiver) }

    }



    companion object {

        private const val TAG = "PowerRepository"

    }

}

packages/SystemUI/src/com/android/systemui/power/data/repository/PowerRepositoryModule.kt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.power.data.repository



import dagger.Binds

import dagger.Module



@Module

interface PowerRepositoryModule {

    @Binds fun bindRepository(impl: PowerRepositoryImpl): PowerRepository

}