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

Commit 4bfc4100 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Fold notificationsRedesignGuts changes into templates flag" into main

parents 122c10f8 91677c44

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -66,13 +66,6 @@ flag { 
  bug: "375010573"

}



flag {

  name: "notifications_redesign_guts"

  namespace: "systemui"

  description: "Notifications Redesign: Update the look of the notification guts (that appear on long press). This includes using the new cache for app icons."

  bug: "394822197"

}



flag {

   name: "notification_row_content_binder_refactor"

   namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationInfoTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ class NotificationInfoTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(com.android.systemui.Flags.FLAG_NOTIFICATIONS_REDESIGN_GUTS)

    @DisableFlags(Flags.FLAG_NOTIFICATIONS_REDESIGN_TEMPLATES)

    fun testBindNotification_SetsPackageIcon_flagOff() {

        val iconDrawable = mock<Drawable>()

        whenever(mockPackageManager.getApplicationIcon(any<ApplicationInfo>()))
@@ -225,7 +225,7 @@ class NotificationInfoTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(com.android.systemui.Flags.FLAG_NOTIFICATIONS_REDESIGN_GUTS)

    @EnableFlags(Flags.FLAG_NOTIFICATIONS_REDESIGN_TEMPLATES)

    fun testBindNotification_SetsPackageIcon_flagOn() {

        val iconDrawable = mock<Drawable>()

        whenever(mockIconStyleProvider.shouldShowWorkProfileBadge(anyOrNull(), anyOrNull()))

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java

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


package com.android.systemui.statusbar.notification.row;



import static android.app.Flags.notificationsRedesignTemplates;

import static android.app.Flags.notificationsRedesignThemedAppIcons;

import static android.app.Notification.EXTRA_BUILDER_APPLICATION_INFO;

import static android.app.NotificationChannel.SYSTEM_RESERVED_IDS;
@@ -26,7 +27,6 @@ import static android.service.notification.Adjustment.KEY_SUMMARIZATION; 
import static android.service.notification.Adjustment.KEY_TYPE;



import static com.android.app.animation.Interpolators.FAST_OUT_SLOW_IN;

import static com.android.systemui.Flags.notificationsRedesignGuts;



import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -330,7 +330,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
        ApplicationInfo info =

                mSbn.getNotification().extras.getParcelable(EXTRA_BUILDER_APPLICATION_INFO,

                        ApplicationInfo.class);

        if (notificationsRedesignGuts()) {

        if (notificationsRedesignTemplates()) {

            if (info != null) {

                try {

                    mAppName = String.valueOf(mPm.getApplicationLabel(info));