From 52ea5d8b7c0321d44169afb428585af556f38e66 Mon Sep 17 00:00:00 2001
From: Yining Liu <liuyining@google.com>
Date: Mon, 31 Oct 2022 21:52:00 +0000
Subject: [PATCH 1/2] Increase the number of notification items that can be
 shown in Notification history - Recently dismissed

 Increase the max number of items shown in 'Notification history - Recently dismissed' from 6 to 50.

Bug: 255784319
Test: Manual: Dismiss 6 or more notifications, open Settings-Notifications-Notification History, the max item count under `Recently dismissed` should be 50.
Change-Id: Ia13158ae1ebca448d43bf4c6f6037758b3f40615
---
 .../notification/history/NotificationHistoryActivity.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 4fecfc9b722..1f83cc72896 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -73,6 +73,10 @@ import java.util.concurrent.TimeUnit;
 public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
 
     private static String TAG = "NotifHistory";
+    // MAX_RECENT_DISMISS_ITEM_COUNT needs to be less or equals than
+    // R.integer.config_notificationServiceArchiveSize, which is the Number of notifications kept
+    // in the notification service historical archive
+    private static final int MAX_RECENT_DISMISS_ITEM_COUNT = 50;
 
     private ViewGroup mHistoryOn;
     private ViewGroup mHistoryOff;
@@ -388,7 +392,8 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
                 snoozed = getSnoozedNotifications();
                 dismissed = mNm.getHistoricalNotificationsWithAttribution(
                         NotificationHistoryActivity.this.getPackageName(),
-                        NotificationHistoryActivity.this.getAttributionTag(), 6, false);
+                        NotificationHistoryActivity.this.getAttributionTag(),
+                        MAX_RECENT_DISMISS_ITEM_COUNT, false);
             } catch (SecurityException | RemoteException e) {
                 Log.d(TAG, "OnPaused called while trying to retrieve notifications");
             }

From dd7e4881977daf41295d230441d0abe8bc4da696 Mon Sep 17 00:00:00 2001
From: Grace Cheng <graciecheng@google.com>
Date: Fri, 11 Nov 2022 15:36:23 +0000
Subject: [PATCH 2/2] Update fingerprint enrollment finished string

Updates string displayed at completion of fingerprint enrollment

Test: Observe updated string after enrolling a fingerprint
Fixes: 257898484
Change-Id: I40ab1b67030f164c96c8abca0837bacc1560d1b5
---
 res/values/strings.xml                                    | 8 +++-----
 .../biometrics/fingerprint/FingerprintEnrollFinish.java   | 6 +-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 96ffb8d3480..504c896cf33 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1287,14 +1287,12 @@
     <string name="security_settings_udfps_enroll_progress_a11y_message">Enrolling fingerprint <xliff:g id="percentage" example="10">%d</xliff:g> percent</string>
     <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
-    <!-- Message shown in SFPS enrollment dialog once enrollment is completed [CHAR LIMIT=NONE] -->
-    <string name="security_settings_sfps_enroll_finish">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (tablet) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="tablet">Now you can use your fingerprint to unlock your tablet or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (device) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device">Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="device">Now you can use your fingerprint to unlock your device or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed (default) [CHAR LIMIT=NONE] -->
-    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps</string>
+    <string name="security_settings_fingerprint_enroll_finish_v2_message" product="default">Now you can use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase</string>
     <!-- Title for require screen on to auth toggle shown in fingerprint enrollment dialog once enrollment is completed. [CHAR LIMIT=NONE] -->
     <string name="security_settings_require_screen_on_to_auth_title">Unlock only when screen is on</string>
     <!-- Description for require screen on to auth toggle shown in fingerprint enrollment dialog once enrollment is completed. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 45063104134..04a997cf68c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -81,11 +81,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
             setContentView(R.layout.fingerprint_enroll_finish);
         }
         setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title);
-        if (mCanAssumeSfps) {
-            setDescriptionText(R.string.security_settings_sfps_enroll_finish);
-        } else {
-            setDescriptionText(R.string.security_settings_fingerprint_enroll_finish_v2_message);
-        }
+        setDescriptionText(R.string.security_settings_fingerprint_enroll_finish_v2_message);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(