Update desktop icon/app Chip with the new icon

Add desktop icon/app Chip text

Test: OverviewDesktopTaskImageTest
BUG: 320310236
Flag: EXEMPT resource only update
Change-Id: I6a41cff78690777745b8dcbfea1b8fadee200f96
This commit is contained in:
vinayjoglekar
2024-08-08 12:06:45 +01:00
committed by Vinay Joglekar
parent 9164534fb9
commit 7a73c2db59
5 changed files with 51 additions and 40 deletions

View File

@@ -34,7 +34,7 @@ class DesktopSystemShortcut(
abstractFloatingViewHelper: AbstractFloatingViewHelper
) :
SystemShortcut<RecentsViewContainer>(
R.drawable.ic_caption_desktop_button_foreground,
R.drawable.ic_desktop,
R.string.recent_task_option_desktop,
container,
taskContainer.itemInfo,

View File

@@ -19,7 +19,6 @@ import android.content.Context
import android.graphics.Point
import android.graphics.PointF
import android.graphics.Rect
import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.ShapeDrawable
import android.graphics.drawable.shapes.RoundRectShape
import android.util.AttributeSet
@@ -27,6 +26,7 @@ import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.content.res.ResourcesCompat
import androidx.core.view.updateLayoutParams
import com.android.launcher3.Flags.enableRefactorTaskThumbnail
import com.android.launcher3.R
@@ -84,9 +84,15 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu
}
iconView =
getOrInflateIconView(R.id.icon).apply {
val iconBackground = resources.getDrawable(R.drawable.bg_circle, context.theme)
val icon = resources.getDrawable(R.drawable.ic_desktop, context.theme)
setIcon(this, LayerDrawable(arrayOf(iconBackground, icon)))
setIcon(
this,
ResourcesCompat.getDrawable(
context.resources,
R.drawable.ic_desktop_with_bg,
context.theme
)
)
setText(resources.getText(R.string.recent_task_option_desktop))
}
childCountAtInflation = childCount
}
@@ -266,6 +272,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu
private const val TAG = "DesktopTaskView"
private const val DEBUG = false
private const val VIEW_POOL_MAX_SIZE = 10
// As DesktopTaskView is inflated in background, use initialSize=0 to avoid initPool.
private const val VIEW_POOL_INITIAL_SIZE = 0
private val ORIGIN = Point(0, 0)