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

Commit 23de75a4 authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

Merge "Update LnT attention icon." into udc-qpr-dev am: 72ca1e1c am: 2782495a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24151953



Change-Id: Ic03ed9681256f1af9217c0ada76712ef68a06de8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f045f8dd 2782495a

packages/SystemUI/res/drawable/dream_overlay_assistant_attention_indicator.xml

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

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~
@@ -13,30 +14,22 @@ 
  ~ 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="56dp"

    android:height="24dp"

    android:viewportWidth="56"

    android:viewportHeight="24">

    <path

        android:pathData="M12,0L44,0A12,12 0,0 1,56 12L56,12A12,12 0,0 1,44 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

        android:fillColor="#ffffff"/>

    <group

        android:scaleX="0.8"

        android:scaleY="0.8"

        android:translateY="2"

        android:translateX="18">

        <path

            android:pathData="M21.5,9C22.3284,9 23,8.3284 23,7.5C23,6.6716 22.3284,6 21.5,6C20.6716,6 20,6.6716 20,7.5C20,8.3284 20.6716,9 21.5,9Z"

            android:fillColor="#000000"/>

        <path

            android:pathData="M17,14C18.6569,14 20,12.6569 20,11C20,9.3432 18.6569,8 17,8C15.3431,8 14,9.3432 14,11C14,12.6569 15.3431,14 17,14Z"

            android:fillColor="#000000"/>

        <path

            android:pathData="M17,22C18.933,22 20.5,20.433 20.5,18.5C20.5,16.567 18.933,15 17,15C15.067,15 13.5,16.567 13.5,18.5C13.5,20.433 15.067,22 17,22Z"

            android:fillColor="#000000"/>

        <path

            android:pathData="M7,14C10.3137,14 13,11.3137 13,8C13,4.6863 10.3137,2 7,2C3.6863,2 1,4.6863 1,8C1,11.3137 3.6863,14 7,14Z"

            android:fillColor="#000000"/>

    </group>

</vector>
 
 No newline at end of file
 


<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@id/background"

        android:gravity="center">

        <shape android:shape="oval">

            <size

                android:height="24px"

                android:width="24px"

                />

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

        </shape>

    </item>

    <item android:id="@id/icon"

        android:gravity="center"

        android:width="20px"

        android:height="20px"

        android:drawable="@drawable/ic_person_outline"

        />

</layer-list>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_person_outline.xml

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

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

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

    <path

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

        android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800ZM240,720L720,720L720,688Q720,677 714.5,668Q709,659 700,654Q646,627 591,613.5Q536,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400ZM480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320ZM480,720L480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720L480,720L480,720Z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/dream_overlay_status_bar_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 


        <ImageView

            android:id="@+id/dream_overlay_assistant_attention_indicator"

            android:layout_width="@dimen/dream_overlay_grey_chip_width"

            android:layout_width="@dimen/dream_overlay_status_bar_icon_size"

            android:layout_height="match_parent"

            android:layout_marginStart="@dimen/dream_overlay_status_icon_margin"

            android:src="@drawable/dream_overlay_assistant_attention_indicator"