diff options
3 files changed, 6 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/res/values/ids.xml b/libs/WindowManager/Shell/res/values/ids.xml index 8831b610f44a..bc59a235517d 100644 --- a/libs/WindowManager/Shell/res/values/ids.xml +++ b/libs/WindowManager/Shell/res/values/ids.xml @@ -42,4 +42,6 @@ <item type="id" name="action_move_top_right"/> <item type="id" name="action_move_bottom_left"/> <item type="id" name="action_move_bottom_right"/> + + <item type="id" name="dismiss_view"/> </resources> diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissViewExt.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissViewExt.kt index ed3624035757..48692d41016e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissViewExt.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/DismissViewExt.kt @@ -22,6 +22,7 @@ import com.android.wm.shell.common.bubbles.DismissView fun DismissView.setup() { setup(DismissView.Config( + dismissViewResId = R.id.dismiss_view, targetSizeResId = R.dimen.dismiss_circle_size, iconSizeResId = R.dimen.dismiss_target_x_size, bottomMarginResId = R.dimen.floating_dismiss_bottom_margin, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/DismissView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/DismissView.kt index d275a0be8e93..2eb55e19a960 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/DismissView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/bubbles/DismissView.kt @@ -49,6 +49,8 @@ class DismissView(context: Context) : FrameLayout(context) { * @see [setup] method */ data class Config( + /** The resource id to set on the dismiss target circle view */ + val dismissViewResId: Int, /** dimen resource id of the dismiss target circle view size */ @DimenRes val targetSizeResId: Int, /** dimen resource id of the icon size in the dismiss target */ @@ -121,6 +123,7 @@ class DismissView(context: Context) : FrameLayout(context) { setBackgroundDrawable(gradientDrawable) // Setup DismissCircleView + circle.id = config.dismissViewResId circle.setup(config.backgroundResId, config.iconResId, config.iconSizeResId) val targetSize: Int = resources.getDimensionPixelSize(config.targetSizeResId) circle.layoutParams = LayoutParams(targetSize, targetSize, |