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

Commit 8d6e3b08 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13445602 from c44486e5 to 25Q3-release

Change-Id: If54a25cad0d56ebfc4d1c6cc0ea8679a099a7b8c
parents 96921bdd c44486e5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

package com.android.systemui.underlay.ui.compose
package com.android.systemui.ambientcue.ui.compose

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.tween
@@ -29,7 +29,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEachIndexed
import com.android.systemui.underlay.ui.viewmodel.ActionViewModel
import com.android.systemui.ambientcue.ui.viewmodel.ActionViewModel

@Composable
fun ActionList(actions: List<ActionViewModel>, visible: Boolean, modifier: Modifier = Modifier) {
+3 −3
Original line number Diff line number Diff line
@@ -14,17 +14,17 @@
 * limitations under the License.
 */

package com.android.systemui.underlay.ui.compose
package com.android.systemui.ambientcue.ui.compose

import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import javax.inject.Inject

interface UnderlayComposableProvider {
interface AmbientCueComposableProvider {
    @Composable fun Content(modifier: Modifier)
}

class UnderlayComposableProviderImpl @Inject constructor() : UnderlayComposableProvider {
class AmbientCueComposableProviderImpl @Inject constructor() : AmbientCueComposableProvider {

    @Composable override fun Content(modifier: Modifier) {}
}
+7 −7
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@
 * limitations under the License.
 */

package com.android.systemui.underlay
package com.android.systemui.ambientcue

import com.android.systemui.underlay.ui.compose.UnderlayComposableProvider
import com.android.systemui.underlay.ui.compose.UnderlayComposableProviderImpl
import com.android.systemui.ambientcue.ui.compose.AmbientCueComposableProvider
import com.android.systemui.ambientcue.ui.compose.AmbientCueComposableProviderImpl
import dagger.Binds
import dagger.Module

@Module
interface UnderlayComposableProviderModule {
interface AmbientCueComposableProviderModule {

    @Binds
    fun bindUnderlayComposableProvider(
        provider: UnderlayComposableProviderImpl
    ): UnderlayComposableProvider
    fun bindAmbientCueComposableProvider(
        provider: AmbientCueComposableProviderImpl
    ): AmbientCueComposableProvider
}
+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

package com.android.systemui.underlay.ui.compose
package com.android.systemui.ambientcue.ui.compose

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -23,15 +23,15 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.android.systemui.ambientcue.ui.viewmodel.AmbientCueViewModel
import com.android.systemui.lifecycle.rememberViewModel
import com.android.systemui.underlay.ui.viewmodel.OverlayViewModel

@Composable
fun OverlayContainer(
fun AmbientCueContainer(
    modifier: Modifier = Modifier,
    overlayViewModelFactory: OverlayViewModel.Factory,
    ambientCueViewModelFactory: AmbientCueViewModel.Factory,
) {
    val viewModel = rememberViewModel("OverlayContainer") { overlayViewModelFactory.create() }
    val viewModel = rememberViewModel("AmbientCueContainer") { ambientCueViewModelFactory.create() }

    val visible = viewModel.isOverlayVisible
    val expanded = viewModel.isOverlayExpanded
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

package com.android.systemui.underlay.ui.compose
package com.android.systemui.ambientcue.ui.compose

import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
Loading