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

Commit 2ddd6e32 authored by Tianfan Zhang's avatar Tianfan Zhang
Browse files

Add ActionType into ActionModel and ActionViewModel. 

Bug: 403422950
Flag: com.android.systemui.enable_underlay
Test: Local

Change-Id: I4e07957000c47eab74845b1cadc5e1eeae270359
parent 13a56503

packages/SystemUI/src/com/android/systemui/ambientcue/data/repository/AmbientCueRepository.kt

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ constructor( 
                                val title = chip.title.toString()

                                val activityId =

                                    chip.extras?.getParcelable<ActivityId>(EXTRA_ACTIVITY_ID)

                                val actionType = chip.extras?.getString(EXTRA_ACTION_TYPE)

                                ActionModel(

                                    icon =

                                        chip.icon?.loadDrawable(applicationContext)
@@ -169,6 +170,7 @@ constructor( 
                                        }

                                    },

                                    taskId = activityId?.taskId ?: INVALID_TASK_ID,

                                    actionType = actionType,

                                )

                            }

                    if (DEBUG) {
@@ -268,6 +270,7 @@ constructor( 
        @VisibleForTesting const val AMBIENT_CUE_SURFACE = "ambientcue"

        @VisibleForTesting const val EXTRA_ACTIVITY_ID = "activityId"

        @VisibleForTesting const val EXTRA_AUTOFILL_ID = "autofillId"

        private const val EXTRA_ACTION_TYPE = "actionType"

        // Timeout to hide cuebar if it wasn't interacted with

        private const val TAG = "AmbientCueRepository"

        private const val DEBUG = false

packages/SystemUI/src/com/android/systemui/ambientcue/shared/model/ActionModel.kt

+1 −0
Original line number Diff line number Diff line
@@ -25,4 +25,5 @@ data class ActionModel( 
    val attribution: String?,

    val onPerformAction: () -> Unit,

    val taskId: Int = INVALID_TASK_ID,

    val actionType: String? = null,

)

packages/SystemUI/src/com/android/systemui/ambientcue/ui/viewmodel/ActionViewModel.kt

+7 −0
Original line number Diff line number Diff line
@@ -23,4 +23,11 @@ data class ActionViewModel( 
    val label: String,

    val attribution: String? = null,

    val onClick: () -> Unit,

    val actionType: ActionType,

)



enum class ActionType {

    MA,

    MR,

    Unknown,

}

packages/SystemUI/src/com/android/systemui/ambientcue/ui/viewmodel/AmbientCueViewModel.kt

+6 −0
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ constructor(private val ambientCueInteractor: AmbientCueInteractor) : ExclusiveA 
                                action.onPerformAction()

                                collapse()

                            },

                            actionType =

                                when (action.actionType) {

                                    "ma" -> ActionType.MA

                                    "mr" -> ActionType.MR

                                    else -> ActionType.Unknown

                                },

                        )

                    }

                },