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

Commit ffe40e74 authored by Tianfan Zhang's avatar Tianfan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add ActionType into ActionModel and ActionViewModel." into main

parents 8824343e 2ddd6e32

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

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,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)
@@ -190,6 +191,7 @@ constructor( 
                                        }

                                    },

                                    taskId = activityId?.taskId ?: INVALID_TASK_ID,

                                    actionType = actionType,

                                )

                            }

                    if (DEBUG) {
@@ -278,6 +280,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
@@ -100,6 +100,12 @@ constructor(private val ambientCueInteractor: AmbientCueInteractor) : ExclusiveA 
                                action.onPerformAction()

                                collapse()

                            },

                            actionType =

                                when (action.actionType) {

                                    "ma" -> ActionType.MA

                                    "mr" -> ActionType.MR

                                    else -> ActionType.Unknown

                                },

                        )

                    }

                },