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

Commit 9aa24659 authored by Szu-An Lu's avatar Szu-An Lu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-26232405-volume_panel_anc_ui-MPEBONCRTC" into main 

* changes:
  Revert "Add ANC data and domain."
  Revert "Add ANC UI."
parents 12e867a9 4a5f6a23

packages/SystemUI/compose/facade/disabled/src/com/android/systemui/volume/panel/component/anc/AncModule

deleted100644 → 0
+0 −21
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 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.volume.panel.component.anc



import dagger.Module



@Module interface AncModule

packages/SystemUI/compose/features/src/com/android/systemui/statusbar/phone/SystemUIDialogFactoryExt.kt

+1 −5
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.phone

package com.android.systemui.statusbar.phone





import android.content.Context

import android.content.Context

import androidx.annotation.GravityInt

import androidx.compose.material3.LocalContentColor

import androidx.compose.material3.LocalContentColor

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable
@@ -46,17 +45,14 @@ import com.android.compose.theme.PlatformTheme 
 * @param context the [Context] in which the dialog will be constructed.

 * @param context the [Context] in which the dialog will be constructed.

 * @param dismissOnDeviceLock whether the dialog should be automatically dismissed when the device

 * @param dismissOnDeviceLock whether the dialog should be automatically dismissed when the device

 *   is locked (true by default).

 *   is locked (true by default).

 * @param dialogGravity is one of the [android.view.Gravity] and determines dialog position on the

 *   screen.

 */

 */

fun SystemUIDialogFactory.create(

fun SystemUIDialogFactory.create(

    context: Context = this.applicationContext,

    context: Context = this.applicationContext,

    theme: Int = SystemUIDialog.DEFAULT_THEME,

    theme: Int = SystemUIDialog.DEFAULT_THEME,

    dismissOnDeviceLock: Boolean = SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK,

    dismissOnDeviceLock: Boolean = SystemUIDialog.DEFAULT_DISMISS_ON_DEVICE_LOCK,

    @GravityInt dialogGravity: Int? = null,

    content: @Composable (SystemUIDialog) -> Unit,

    content: @Composable (SystemUIDialog) -> Unit,

): ComponentSystemUIDialog {

): ComponentSystemUIDialog {

    val dialog = create(context, theme, dismissOnDeviceLock, dialogGravity)

    val dialog = create(context, theme, dismissOnDeviceLock)





    // Create the dialog so that it is properly constructed before we set the Compose content.

    // Create the dialog so that it is properly constructed before we set the Compose content.

    // Otherwise, the ComposeView won't render properly.

    // Otherwise, the ComposeView won't render properly.

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/anc/AncModule.kt

deleted100644 → 0
+0 −53
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 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.volume.panel.component.anc



import com.android.systemui.volume.panel.component.anc.domain.AncAvailabilityCriteria

import com.android.systemui.volume.panel.component.anc.ui.composable.AncPopup

import com.android.systemui.volume.panel.component.anc.ui.viewmodel.AncViewModel

import com.android.systemui.volume.panel.component.button.ui.composable.ButtonComponent

import com.android.systemui.volume.panel.component.shared.model.VolumePanelComponents

import com.android.systemui.volume.panel.domain.ComponentAvailabilityCriteria

import com.android.systemui.volume.panel.shared.model.VolumePanelUiComponent

import dagger.Binds

import dagger.Module

import dagger.Provides

import dagger.multibindings.IntoMap

import dagger.multibindings.StringKey



/** Dagger module, that provides Active Noise Cancellation Volume Panel UI functionality. */

@Module

interface AncModule {



    @Binds

    @IntoMap

    @StringKey(VolumePanelComponents.ANC)

    fun bindComponentAvailabilityCriteria(

        criteria: AncAvailabilityCriteria

    ): ComponentAvailabilityCriteria



    companion object {



        @Provides

        @IntoMap

        @StringKey(VolumePanelComponents.ANC)

        fun provideVolumePanelUiComponent(

            viewModel: AncViewModel,

            popup: AncPopup,

        ): VolumePanelUiComponent = ButtonComponent(viewModel.button, popup::show)

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/anc/ui/composable/AncPopup.kt

deleted100644 → 0
+0 −109
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 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.volume.panel.component.anc.ui.composable



import android.content.Context

import android.view.View

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.SideEffect

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.getValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.text.style.TextAlign

import androidx.compose.ui.viewinterop.AndroidView

import androidx.slice.Slice

import androidx.slice.widget.SliceView

import com.android.systemui.animation.Expandable

import com.android.systemui.res.R

import com.android.systemui.statusbar.phone.SystemUIDialog

import com.android.systemui.volume.panel.component.anc.ui.viewmodel.AncViewModel

import com.android.systemui.volume.panel.component.popup.ui.composable.VolumePanelPopup

import javax.inject.Inject



/** ANC popup up displaying ANC control [Slice]. */

class AncPopup

@Inject

constructor(

    private val volumePanelPopup: VolumePanelPopup,

    private val viewModel: AncViewModel,

) {



    fun show(expandable: Expandable) {

        volumePanelPopup.show(expandable, { Title() }, { Content(it) })

    }



    @Composable

    private fun Title() {

        Text(

            text = stringResource(R.string.volume_panel_noise_control_title),

            style = MaterialTheme.typography.titleMedium,

            textAlign = TextAlign.Center,

            maxLines = 1,

        )

    }



    @Composable

    private fun Content(dialog: SystemUIDialog) {

        val slice: Slice? by viewModel.slice.collectAsState()



        if (slice == null) {

            SideEffect { dialog.dismiss() }

            return

        }



        AndroidView<SliceView>(

            modifier = Modifier.fillMaxWidth(),

            factory = { context: Context ->

                SliceView(context).apply {

                    mode = SliceView.MODE_LARGE

                    isScrollable = false

                    importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO

                    setShowTitleItems(true)

                    addOnLayoutChangeListener(

                        OnWidthChangedLayoutListener(viewModel::changeSliceWidth)

                    )

                }

            },

            update = { sliceView: SliceView -> sliceView.slice = slice }

        )

    }



    private class OnWidthChangedLayoutListener(private val widthChanged: (Int) -> Unit) :

        View.OnLayoutChangeListener {

        override fun onLayoutChange(

            v: View?,

            left: Int,

            top: Int,

            right: Int,

            bottom: Int,

            oldLeft: Int,

            oldTop: Int,

            oldRight: Int,

            oldBottom: Int

        ) {

            val newWidth = right - left

            val oldWidth = oldRight - oldLeft

            if (oldWidth != newWidth) {

                widthChanged(newWidth)

            }

        }

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/button/ui/composable/ButtonComponent.kt

deleted100644 → 0
+0 −80
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2024 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.volume.panel.component.button.ui.composable



import androidx.compose.foundation.BorderStroke

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.getValue

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.text.style.TextOverflow

import androidx.compose.ui.unit.dp

import com.android.compose.animation.Expandable

import com.android.systemui.animation.Expandable

import com.android.systemui.common.ui.compose.Icon

import com.android.systemui.volume.panel.component.button.ui.viewmodel.ButtonViewModel

import com.android.systemui.volume.panel.ui.composable.ComposeVolumePanelUiComponent

import com.android.systemui.volume.panel.ui.composable.VolumePanelComposeScope

import kotlinx.coroutines.flow.StateFlow



class ButtonComponent(

    private val viewModelFlow: StateFlow<ButtonViewModel?>,

    private val onClick: (Expandable) -> Unit

) : ComposeVolumePanelUiComponent {



    @Composable

    override fun VolumePanelComposeScope.Content(modifier: Modifier) {

        val viewModelByState by viewModelFlow.collectAsState()

        val viewModel = viewModelByState ?: return



        Column(

            modifier = modifier,

            verticalArrangement = Arrangement.spacedBy(12.dp),

            horizontalAlignment = Alignment.CenterHorizontally,

        ) {

            Expandable(

                modifier = Modifier.height(64.dp).fillMaxWidth(),

                color = MaterialTheme.colorScheme.primaryContainer,

                shape = RoundedCornerShape(28.dp),

                contentColor = MaterialTheme.colorScheme.onPrimaryContainer,

                borderStroke = BorderStroke(8.dp, MaterialTheme.colorScheme.surface),

                onClick = onClick,

            ) {

                Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {

                    Icon(modifier = Modifier.size(24.dp), icon = viewModel.icon)

                }

            }

            Text(

                text = viewModel.label.toString(),

                style = MaterialTheme.typography.labelMedium,

                maxLines = 1,

                overflow = TextOverflow.Ellipsis,

            )

        }

    }

}