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

Commit c2090b2c authored by Kai Li's avatar Kai Li Committed by Android (Google) Code Review
Browse files

Merge "Replace clipboard icon" into main

parents e2efe83e 0be80f37

packages/SystemUI/multivalentTests/src/com/android/systemui/ambientcue/domain/interactor/AmbientCueInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class AmbientCueInteractorTest : SysuiTestCase() { 
                    ActionModel(

                        icon =

                            applicationContext.resources.getDrawable(

                                R.drawable.clipboard,

                                R.drawable.ic_content_paste_spark,

                                applicationContext.theme,

                            ),

                        label = "Sunday Morning",

packages/SystemUI/res/drawable/clipboard.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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="16dp"

    android:height="16dp"

    android:viewportWidth="16"

    android:viewportHeight="16">

    <path

        android:pathData="M4.1,11.6C3.85,11.6 3.638,11.512 3.463,11.337C3.287,11.163 3.2,10.95 3.2,10.7V9.65C3.2,9.525 3.242,9.421 3.325,9.337C3.417,9.246 3.525,9.2 3.65,9.2C3.775,9.2 3.879,9.246 3.963,9.337C4.054,9.421 4.1,9.525 4.1,9.65V10.7H11.9V5.3H4.1V6.35C4.1,6.475 4.054,6.583 3.963,6.675C3.879,6.758 3.775,6.8 3.65,6.8C3.525,6.8 3.417,6.758 3.325,6.675C3.242,6.583 3.2,6.475 3.2,6.35V5.3C3.2,5.05 3.287,4.838 3.463,4.662C3.638,4.488 3.85,4.4 4.1,4.4H11.9C12.15,4.4 12.363,4.488 12.538,4.662C12.712,4.838 12.8,5.05 12.8,5.3V10.7C12.8,10.95 12.712,11.163 12.538,11.337C12.363,11.512 12.15,11.6 11.9,11.6H4.1ZM7.475,8.45H3.65C3.525,8.45 3.417,8.408 3.325,8.325C3.242,8.233 3.2,8.125 3.2,8C3.2,7.875 3.242,7.771 3.325,7.688C3.417,7.596 3.525,7.55 3.65,7.55H7.475L6.775,6.85C6.683,6.758 6.637,6.654 6.637,6.537C6.637,6.412 6.683,6.304 6.775,6.213C6.867,6.121 6.971,6.075 7.088,6.075C7.213,6.075 7.321,6.121 7.412,6.213L8.887,7.688C8.979,7.779 9.025,7.883 9.025,8C9.025,8.117 8.979,8.221 8.887,8.313L7.412,9.788C7.321,9.879 7.217,9.925 7.1,9.925C6.983,9.917 6.879,9.867 6.787,9.775C6.696,9.683 6.65,9.579 6.65,9.462C6.65,9.337 6.696,9.229 6.787,9.137L7.475,8.45Z"

        android:fillColor="#F40F0F"/>

</vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ constructor( 
                                    icon =

                                        chip.icon?.loadDrawable(applicationContext)

                                            ?: applicationContext.getDrawable(

                                                R.drawable.clipboard

                                                R.drawable.ic_content_paste_spark

                                            )!!,

                                    intent = chip.intent,

                                    label = chip.title.toString(),