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

Commit 9b10a804 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag to bypass shortcut req for "convo" notifs"

parents 63b67c0e b8cede42

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4279,6 +4279,7 @@ package android.util { 
    field public static final String FFLAG_OVERRIDE_PREFIX = "sys.fflag.override.";

    field public static final String FFLAG_PREFIX = "sys.fflag.";

    field public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    field public static final String NOTIF_CONVO_BYPASS_SHORTCUT_REQ = "settings_notif_convo_bypass_shortcut_req";

    field public static final String PERSIST_PREFIX = "persist.sys.fflag.override.";

    field public static final String SCREENRECORD_LONG_PRESS = "settings_screenrecord_long_press";

    field public static final String SEAMLESS_TRANSFER = "settings_seamless_transfer";

core/java/android/util/FeatureFlagUtils.java

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public class FeatureFlagUtils { 
    public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";

    public static final String SETTINGS_WIFITRACKER2 = "settings_wifitracker2";

    public static final String SETTINGS_FUSE_FLAG = "settings_fuse";

    public static final String NOTIF_CONVO_BYPASS_SHORTCUT_REQ =

            "settings_notif_convo_bypass_shortcut_req";



    private static final Map<String, String> DEFAULT_FLAGS;
@@ -60,6 +62,7 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_work_profile", "true");

        DEFAULT_FLAGS.put("settings_controller_loading_enhancement", "false");

        DEFAULT_FLAGS.put("settings_conditionals", "false");

        DEFAULT_FLAGS.put(NOTIF_CONVO_BYPASS_SHORTCUT_REQ, "false");

    }



    /**

packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleNotificationIdentifier.kt

+10 −2
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
package com.android.systemui.statusbar.notification.people



import android.app.Notification

import android.content.Context

import android.service.notification.StatusBarNotification

import android.util.FeatureFlagUtils

import javax.inject.Inject

import javax.inject.Singleton
@@ -27,10 +29,16 @@ interface PeopleNotificationIdentifier { 


@Singleton

class PeopleNotificationIdentifierImpl @Inject constructor(

    private val personExtractor: NotificationPersonExtractor

    private val personExtractor: NotificationPersonExtractor,

    private val context: Context

) : PeopleNotificationIdentifier {



    override fun isPeopleNotification(sbn: StatusBarNotification) =

            sbn.notification.notificationStyle == Notification.MessagingStyle::class.java ||

            (sbn.notification.notificationStyle == Notification.MessagingStyle::class.java &&

                    (sbn.notification.shortcutId != null ||

                            FeatureFlagUtils.isEnabled(

                                    context,

                                    FeatureFlagUtils.NOTIF_CONVO_BYPASS_SHORTCUT_REQ

                            ))) ||

                    personExtractor.isPersonNotification(sbn)

}
 
 No newline at end of file