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

Commit fee62395 authored by Vinay Joglekar's avatar Vinay Joglekar Committed by Android (Google) Code Review
Browse files

Merge "Update desktop icon/app Chip with the new icon" into main

parents de9b1df6 7a73c2db

quickstep/res/drawable/bg_circle.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2020 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    <solid android:color="#FFFFFFFF" />

</shape>
 
 No newline at end of file

quickstep/res/drawable/ic_desktop.xml

+10 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,17 +14,13 @@ 
  ~ limitations under the License.

  -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="32.0dp"

    android:height="32.0dp"

    android:viewportWidth="32.0"

    android:viewportHeight="32.0"

    >

    <group android:scaleX="0.5"

        android:scaleY="0.5"

        android:translateX="6.0"

        android:translateY="6.0">

    android:width="24dp"

    android:height="24dp"

    android:autoMirrored="true"

    android:tint="?attr/colorControlNormal"

    android:viewportHeight="960"

    android:viewportWidth="960">

    <path

        android:fillColor="@android:color/black"

            android:pathData="M5.958,37.708Q4.458,37.708 3.354,36.604Q2.25,35.5 2.25,34V18.292Q2.25,16.792 3.354,15.688Q4.458,14.583 5.958,14.583H9.5V5.958Q9.5,4.458 10.625,3.354Q11.75,2.25 13.208,2.25H34Q35.542,2.25 36.646,3.354Q37.75,4.458 37.75,5.958V21.667Q37.75,23.167 36.646,24.271Q35.542,25.375 34,25.375H30.5V34Q30.5,35.5 29.396,36.604Q28.292,37.708 26.792,37.708ZM5.958,34H26.792Q26.792,34 26.792,34Q26.792,34 26.792,34V21.542H5.958V34Q5.958,34 5.958,34Q5.958,34 5.958,34ZM30.5,21.667H34Q34,21.667 34,21.667Q34,21.667 34,21.667V9.208H13.208V14.583H26.833Q28.375,14.583 29.438,15.667Q30.5,16.75 30.5,18.25Z"/>

    </group>

        android:pathData="M240,640L600,640L600,440L240,440L240,640ZM660,520L720,520L720,320L360,320L360,380L660,380L660,520ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z" />

</vector>

quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,

quickstep/src/com/android/quickstep/views/DesktopTaskView.kt

+11 −4
Original line number Diff line number Diff line
@@ -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
@@ -86,9 +86,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

    }
@@ -281,6 +287,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)

res/drawable/ic_desktop_with_bg.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="48dp"

    android:height="48dp"

    android:viewportWidth="48"

    android:viewportHeight="48">

  <path

      android:pathData="M24,2L24,2A22,22 0,0 1,46 24L46,24A22,22 0,0 1,24 46L24,46A22,22 0,0 1,2 24L2,24A22,22 0,0 1,24 2z"

      android:fillColor="#ffffff"/>

  <path

      android:pathData="M32,30H16V18H32V30ZM32,32C33.1,32 34,31.1 34,30V18C34,16.9 33.1,16 32,16H16C14.9,16 14,16.9 14,18V30C14,31.1 14.9,32 16,32H32ZM30,20H23V22H28V24H30V20ZM18,23H27V28H18V23Z"

      android:fillColor="#000000"

      android:fillType="evenOdd"/>

</vector>