diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt index bd6f2c9168..27b30a1f3d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissViewExt.kt @@ -18,6 +18,7 @@ package com.android.launcher3.taskbar.bubbles import com.android.launcher3.R +import com.android.wm.shell.R as SharedR // WM and WMShared are "shared" or linked together. import com.android.wm.shell.shared.bubbles.DismissView /** @@ -36,8 +37,8 @@ fun DismissView.setup() { bottomMarginResId = R.dimen.bubblebar_dismiss_target_bottom_margin, floatingGradientHeightResId = R.dimen.bubblebar_dismiss_floating_gradient_height, floatingGradientColorResId = android.R.color.system_neutral1_900, - backgroundResId = R.drawable.floating_dismiss_background, - iconResId = R.drawable.floating_dismiss_ic_close, + backgroundResId = SharedR.drawable.floating_dismiss_background, + iconResId = SharedR.drawable.floating_dismiss_ic_close, applyMarginOverNavBarInset = false, ) ) diff --git a/wmshell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt b/wmshell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt index ac54ac7a9d..37745d7373 100644 --- a/wmshell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt +++ b/wmshell/shared/src/com/android/wm/shell/shared/multiinstance/ManageWindowsViewContainer.kt @@ -34,7 +34,8 @@ import android.view.View.SCALE_Y import android.view.ViewGroup.MarginLayoutParams import android.widget.LinearLayout import android.window.TaskSnapshot -import com.android.wm.shell.shared.R +import com.android.wm.shell.R +//import com.android.wm.shell.shared.R /** * View for the All Windows menu option, used by both Desktop Windowing and Taskbar.