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

Commit 55bfed58 authored by Jiaming Liu's avatar Jiaming Liu Committed by Android (Google) Code Review
Browse files

Merge "Update icons for concurrent display notifications"

parents 2eae0d9f 725ac0e2

core/res/res/drawable/ic_dual_screen.xml

0 → 100644
+25 −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="48dp"

    android:height="48dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M11,35.9 L25,41.5Q25,41.5 25,41.5Q25,41.5 25,41.5V12.1Q25,12.1 25,12.1Q25,12.1 25,12.1L11,6.5V35.9Q11,35.9 11,35.9Q11,35.9 11,35.9ZM9.9,38.65Q9.05,38.3 8.525,37.575Q8,36.85 8,35.9V7Q8,5.75 8.875,4.875Q9.75,4 11,4L26,9.3Q26.9,9.6 27.45,10.375Q28,11.15 28,12.1V41.5Q28,43.1 26.675,43.975Q25.35,44.85 23.9,44.25ZM25,38V35H37Q37,35 37,35Q37,35 37,35V7Q37,7 37,7Q37,7 37,7H11V4H37Q38.25,4 39.125,4.875Q40,5.75 40,7V35Q40,36.25 39.125,37.125Q38.25,38 37,38ZM11,35.9Q11,35.9 11,35.9Q11,35.9 11,35.9V6.5Q11,6.5 11,6.5Q11,6.5 11,6.5V35.9Q11,35.9 11,35.9Q11,35.9 11,35.9Z"/>

</vector>

core/res/res/drawable/ic_thermostat.xml

0 → 100644
+25 −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="48dp"

    android:height="48dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M26.15,19V16H37.65V19ZM26.15,13V10H42.15V13ZM14.8,41.95Q11.05,41.95 8.375,39.275Q5.7,36.6 5.7,32.85Q5.7,30.45 6.9,28.325Q8.1,26.2 10.2,24.9V10.6Q10.2,8.7 11.55,7.35Q12.9,6 14.8,6Q16.7,6 18.05,7.35Q19.4,8.7 19.4,10.6V24.9Q21.5,26.2 22.7,28.325Q23.9,30.45 23.9,32.85Q23.9,36.6 21.225,39.275Q18.55,41.95 14.8,41.95ZM8.7,32.85H20.9Q20.9,31.1 19.95,29.4Q19,27.7 17.4,27L16.4,26.55V10.6Q16.4,9.9 15.95,9.45Q15.5,9 14.8,9Q14.1,9 13.65,9.45Q13.2,9.9 13.2,10.6V26.55L12.2,27Q10.45,27.8 9.575,29.45Q8.7,31.1 8.7,32.85Z"/>

</vector>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,8 @@ 
  <java-symbol type="drawable" name="ic_feedback_downrank" />



  <java-symbol type="drawable" name="ic_account_circle" />

  <java-symbol type="drawable" name="ic_dual_screen" />

  <java-symbol type="drawable" name="ic_thermostat" />

  <java-symbol type="color" name="user_icon_1" />

  <java-symbol type="color" name="user_icon_2" />

  <java-symbol type="color" name="user_icon_3" />

services/core/java/com/android/server/devicestate/DeviceStateNotificationController.java

+7 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.devicestate;



import android.annotation.DrawableRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;
@@ -103,7 +104,7 @@ class DeviceStateNotificationController extends BroadcastReceiver { 
            showNotification(

                    info.name, info.activeNotificationTitle,

                    String.format(info.activeNotificationContent, requesterApplicationLabel),

                    true /* ongoing */

                    true /* ongoing */, R.drawable.ic_dual_screen

            );

        } else {

            Slog.e(TAG, "Cannot determine the requesting app name when showing state active "
@@ -124,7 +125,8 @@ class DeviceStateNotificationController extends BroadcastReceiver { 
        }

        showNotification(

                info.name, info.thermalCriticalNotificationTitle,

                info.thermalCriticalNotificationContent, false /* ongoing */

                info.thermalCriticalNotificationContent, false /* ongoing */,

                R.drawable.ic_thermostat

        );

    }
@@ -158,11 +160,12 @@ class DeviceStateNotificationController extends BroadcastReceiver { 
     * @param ongoing if true, display an ongoing (sticky) notification with a turn off button.

     */

    private void showNotification(

            @NonNull String name, @NonNull String title, @NonNull String content, boolean ongoing) {

            @NonNull String name, @NonNull String title, @NonNull String content, boolean ongoing,

            @DrawableRes int iconRes) {

        final NotificationChannel channel = new NotificationChannel(

                CHANNEL_ID, name, NotificationManager.IMPORTANCE_HIGH);

        final Notification.Builder builder = new Notification.Builder(mContext, CHANNEL_ID)

                .setSmallIcon(R.drawable.ic_lock) // TODO(b/266833171) update icons when available.

                .setSmallIcon(iconRes)

                .setContentTitle(title)

                .setContentText(content)

                .setSubText(name)