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

Commit c7b54d99 authored by Joseph Johnson's avatar Joseph Johnson Committed by Android (Google) Code Review
Browse files

Merge "Fixed content description of mute toggle on keyguard" into main

parents 2847a899 5fc5021c

packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceConfig.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.Context 
import android.media.AudioManager

import android.media.AudioManager

import androidx.lifecycle.LiveData

import androidx.lifecycle.LiveData

import androidx.lifecycle.Observer

import androidx.lifecycle.Observer

import com.android.systemui.res.R

import com.android.systemui.animation.Expandable

import com.android.systemui.animation.Expandable

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

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

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

import com.android.systemui.common.shared.model.ContentDescription
@@ -31,6 +30,7 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.keyguard.shared.quickaffordance.ActivationState

import com.android.systemui.keyguard.shared.quickaffordance.ActivationState

import com.android.systemui.res.R

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserFileManager

import com.android.systemui.settings.UserTracker

import com.android.systemui.settings.UserTracker

import com.android.systemui.util.RingerModeTracker

import com.android.systemui.util.RingerModeTracker
@@ -86,8 +86,8 @@ constructor( 
                        audioManager.isVolumeFixed ->

                        audioManager.isVolumeFixed ->

                            ActivationState.NotSupported to R.string.volume_ringer_hint_mute

                            ActivationState.NotSupported to R.string.volume_ringer_hint_mute

                        mode == AudioManager.RINGER_MODE_SILENT ->

                        mode == AudioManager.RINGER_MODE_SILENT ->

                            ActivationState.Active to R.string.volume_ringer_hint_mute

                            ActivationState.Active to R.string.volume_ringer_hint_unmute

                        else -> ActivationState.Inactive to R.string.volume_ringer_hint_unmute

                        else -> ActivationState.Inactive to R.string.volume_ringer_hint_mute

                    }

                    }





                KeyguardQuickAffordanceConfig.LockScreenState.Visible(

                KeyguardQuickAffordanceConfig.LockScreenState.Visible(