Allow NotificationAssistantService to suggest smart replies
If the apps has provided their own choices, they will be used, as opposed
to the "smart replies" from NAS.
Otherwise, smart replies will be applied to the notifications
with a freeform RemoteInput but without choices.
The smart reply model is not ready yet, so canned response is hardcoded
and it is disabled by default. To test it out, run
adb shell setprop persist.sys.smart_replies_experiment true
Also, to get rid of the target >= P SDK requirement, you may want to run:
adb shell settings put global smart_replies_in_notifications_flags enabled=true,max_squeeze_remeasure_attempts=3,requires_targeting_p=false
Test: atest SystemUITests
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/NotificationListenerServiceTest.java
Test:
1. adb shell setprop persist.sys.smart_replies_experiment true
2. adb shell settings put global smart_replies_in_notifications_flags enabled=true,max_squeeze_remeasure_attempts=3,requires_targeting_p=false
3. Send a message to myself, observe the hardcoded smart replies.
Bug: 111674540
Change-Id: Ia61a77faef7c4dcba0501abfec80e3e8cc7274e4
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java
index 92bf821..47b7fe9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationUiAdjustment.java
@@ -27,6 +27,7 @@
import androidx.annotation.VisibleForTesting;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -38,18 +39,21 @@
public final String key;
public final List<Notification.Action> smartActions;
+ public final CharSequence[] smartReplies;
@VisibleForTesting
- NotificationUiAdjustment(String key, List<Notification.Action> smartActions) {
+ NotificationUiAdjustment(
+ String key, List<Notification.Action> smartActions, CharSequence[] smartReplies) {
this.key = key;
this.smartActions = smartActions == null
? Collections.emptyList()
: new ArrayList<>(smartActions);
+ this.smartReplies = smartReplies == null ? new CharSequence[0] : smartReplies.clone();
}
public static NotificationUiAdjustment extractFromNotificationEntry(
NotificationData.Entry entry) {
- return new NotificationUiAdjustment(entry.key, entry.smartActions);
+ return new NotificationUiAdjustment(entry.key, entry.smartActions, entry.smartReplies);
}
public static boolean needReinflate(
@@ -58,7 +62,13 @@
if (oldAdjustment == newAdjustment) {
return false;
}
- return areDifferent(oldAdjustment.smartActions, newAdjustment.smartActions);
+ if (areDifferent(oldAdjustment.smartActions, newAdjustment.smartActions)) {
+ return true;
+ }
+ if (!Arrays.equals(oldAdjustment.smartReplies, newAdjustment.smartReplies)) {
+ return true;
+ }
+ return false;
}
public static boolean areDifferent(