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

Commit 12ef3585 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9290907 from e4b09e55 to tm-qpr2-release

Change-Id: Ib68e91a1bfc1a3423ac804ed5c5a4ff78a80ba56
parents eaa64e74 e4b09e55
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -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] -->
+1 −5
Original line number Diff line number Diff line
@@ -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);
        }

        mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
        mFooterBarMixin.setSecondaryButton(
+6 −1
Original line number Diff line number Diff line
@@ -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");
            }