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

Commit 91b51b6a authored by Danny Wang's avatar Danny Wang
Browse files

Screen Sharing: Update audio switch compose style 

screenshot:
before: http://screen/4o3sqrbv9QLHVZY
after: http://screen/BRVHife7CMiQScz

BUG: 440967325
Test: manual
Flag: com.android.systemui.large_screen_sharing
Change-Id: I8f45ba9717cb3cfc86770277523dcbf7caf048f6
parent 1fe32a90

packages/SystemUI/src/com/android/systemui/screencapture/sharescreen/largescreen/ui/compose/ShareContentSelector.kt

+19 −1
Original line number Original line Diff line number Diff line
@@ -28,9 +28,13 @@ import androidx.compose.foundation.layout.padding 
import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.size

import androidx.compose.foundation.layout.width

import androidx.compose.foundation.layout.width

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material.icons.Icons

import androidx.compose.material.icons.filled.Check

import androidx.compose.material3.Icon

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Surface

import androidx.compose.material3.Surface

import androidx.compose.material3.Switch

import androidx.compose.material3.Switch

import androidx.compose.material3.SwitchDefaults

import androidx.compose.material3.Text

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Alignment
@@ -140,6 +144,8 @@ private fun AudioSwitch( 
    audioSwitchViewModel: AudioSwitchViewModel,

    audioSwitchViewModel: AudioSwitchViewModel,

    selectedRecentTaskViewModel: RecentTaskViewModel?,

    selectedRecentTaskViewModel: RecentTaskViewModel?,

) {

) {

    val checked = audioSwitchViewModel.audioSwitchChecked



    Row(

    Row(

        verticalAlignment = Alignment.CenterVertically,

        verticalAlignment = Alignment.CenterVertically,

        horizontalArrangement = Arrangement.SpaceBetween,

        horizontalArrangement = Arrangement.SpaceBetween,
@@ -161,11 +167,23 @@ private fun AudioSwitch( 
            modifier = Modifier.width(452.dp),

            modifier = Modifier.width(452.dp),

        )

        )

        Switch(

        Switch(

            checked = audioSwitchViewModel.audioSwitchChecked,

            checked = checked,

            onCheckedChange = {

            onCheckedChange = {

                audioSwitchViewModel.audioSwitchChecked = !audioSwitchViewModel.audioSwitchChecked

                audioSwitchViewModel.audioSwitchChecked = !audioSwitchViewModel.audioSwitchChecked

            },

            },

            enabled = selectedRecentTaskViewModel != null,

            enabled = selectedRecentTaskViewModel != null,

            thumbContent =

                if (checked) {

                    {

                        Icon(

                            imageVector = Icons.Filled.Check,

                            contentDescription = null,

                            modifier = Modifier.size(SwitchDefaults.IconSize),

                        )

                    }

                } else {

                    null

                },

        )

        )

    }

    }

}
 
}