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

Commit ac1f35f4 authored by Derek Jedral's avatar Derek Jedral
Browse files

Replace suggestion API flag with UI flag 

We should have two flags for suggestion changes. The API flag should be
used to control the rollout of the API itself, while the UI flag should
be to guard UI changes.

Test: atest
Bug: 411452237
Flag: com.android.systemui.enable_suggested_device_ui
Change-Id: I49e5ac959e818145be61d02db13a717b2c485c89
parent 1a9797a7

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -2100,3 +2100,10 @@ flag { 
    description: "Overall changes on Sytem UI when current user is the Headless System User"

    bug: "408066623"

}



flag {

    name: "enable_suggested_device_ui"

    namespace: "systemui"

    description: "Enables the UI for the suggested devices feature."

    bug: "411452237"

}

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import androidx.annotation.AnyThread 
import androidx.annotation.MainThread

import androidx.annotation.WorkerThread

import com.android.media.flags.Flags.enableOutputSwitcherPersonalAudioSharing

import com.android.media.flags.Flags.enableSuggestedDeviceApi

import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast

import com.android.settingslib.bluetooth.LocalBluetoothManager

import com.android.settingslib.flags.Flags.enableLeAudioSharing
@@ -40,6 +39,7 @@ import com.android.settingslib.media.LocalMediaManager 
import com.android.settingslib.media.MediaDevice

import com.android.settingslib.media.PhoneMediaDevice

import com.android.settingslib.media.flags.Flags

import com.android.systemui.Flags.enableSuggestedDeviceUi

import com.android.systemui.Flags.mediaControlsDeviceManagerBackgroundExecution

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

import com.android.systemui.dagger.qualifiers.Main
@@ -306,7 +306,7 @@ constructor( 
        }



        override fun onSuggestedDeviceUpdated(state: SuggestedDeviceState?) {

            if (!enableSuggestedDeviceApi()) {

            if (!enableSuggestedDeviceUi()) {

                return

            }

            bgExecutor.execute {

packages/SystemUI/src/com/android/systemui/media/controls/ui/animation/ColorSchemeTransition.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.content.res.ColorStateList 
import android.graphics.drawable.RippleDrawable

import com.android.internal.R

import com.android.internal.annotations.VisibleForTesting

import com.android.media.flags.Flags.enableSuggestedDeviceApi

import com.android.systemui.Flags.enableSuggestedDeviceUi

import com.android.systemui.media.controls.ui.view.MediaViewHolder

import com.android.systemui.monet.ColorScheme

import com.android.systemui.surfaceeffects.loadingeffect.LoadingEffect
@@ -141,7 +141,7 @@ internal constructor( 
                it.effectColor = primaryColorList

            }

            mediaViewHolder.seekBar.progressBackgroundTintList = primaryColorList

            if (enableSuggestedDeviceApi()) {

            if (enableSuggestedDeviceUi()) {

                mediaViewHolder.deviceSuggestionText.setTextColor(primaryColor)

                mediaViewHolder.deviceSuggestionIcon.imageTintList = primaryColorList

                mediaViewHolder.deviceSuggestionConnectingIcon.indeterminateTintList =

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt

+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ import com.android.app.tracing.traceSection 
import com.android.internal.logging.InstanceId

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.keyguard.KeyguardUpdateMonitorCallback

import com.android.media.flags.Flags.enableSuggestedDeviceApi

import com.android.systemui.Dumpable

import com.android.systemui.Flags

import com.android.systemui.Flags.enableSuggestedDeviceUi

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background
@@ -1217,7 +1217,7 @@ constructor( 
    }



    fun onCarouselVisibleToUser() {

        if (!enableSuggestedDeviceApi() || !mediaCarouselScrollHandler.visibleToUser) {

        if (!enableSuggestedDeviceUi() || !mediaCarouselScrollHandler.visibleToUser) {

            return

        }

        val visibleMediaIndex = mediaCarouselScrollHandler.visibleMediaIndex

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ public class MediaControlPanel { 
    }



    private void bindDeviceSuggestion(@NonNull MediaData data) {

        if (!com.android.media.flags.Flags.enableSuggestedDeviceApi()) {

        if (!Flags.enableSuggestedDeviceUi()) {

            return;

        }

        View deviceSuggestionButton = mMediaViewHolder.getDeviceSuggestionButton();