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

Commit 62f3aea8 authored by Chandru S's avatar Chandru S Committed by Automerger Merge Worker
Browse files

Merge "Show specific messages for why bouncer is shown before or after OTA... 

Merge "Show specific messages for why bouncer is shown before or after OTA update." into udc-dev am: 28c37027

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23675969



Change-Id: Ie181e10487ce357a51b42def6f525ef6e3538be9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54b06a3e 28c37027

packages/SystemUI/res-keyguard/values/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -358,12 +358,12 @@ 
    <!-- Message shown to prepare for an unattended update (OTA). Also known as an over-the-air (OTA) update.  [CHAR LIMIT=70] -->

    <!-- Message shown to prepare for an unattended update (OTA). Also known as an over-the-air (OTA) update.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_unattended_update_pattern">Draw pattern to install update later</string>

    <string name="kg_prompt_unattended_update_pattern">Draw pattern to install update later</string>





    <!-- Message shown after an unattended update (OTA) asking the user to enter their PIN. Also known as an over-the-air (OTA) update.  [CHAR LIMIT=70] -->

    <!--  Message shown after an unattended mainline (major) update asking the user to enter their PIN. [CHAR LIMIT=70] -->

    <string name="kg_prompt_after_update_pin">Device updated. Enter PIN to continue.</string>

    <string name="kg_prompt_after_update_pin">Device updated. Enter PIN to continue.</string>





    <!-- Message shown after an unattended update (OTA) asking the user to enter their password. Also known as an over-the-air (OTA) update.  [CHAR LIMIT=70] -->

    <!-- Message shown after an unattended mainline (major) update asking the user to enter their password. [CHAR LIMIT=70] -->

    <string name="kg_prompt_after_update_password">Device updated. Enter password to continue.</string>

    <string name="kg_prompt_after_update_password">Device updated. Enter password to continue.</string>





    <!-- Message shown after an unattended update (OTA) asking the user to enter their pattern. Also known as an over-the-air (OTA) update.  [CHAR LIMIT=70] -->

    <!-- Message shown after an unattended mainline (major) update asking the user to enter their pattern. [CHAR LIMIT=70] -->

    <string name="kg_prompt_after_update_pattern">Device updated. Draw pattern to continue.</string>

    <string name="kg_prompt_after_update_pattern">Device updated. Draw pattern to continue.</string>

</resources>
 
</resources>

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NONE; 
import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;
@@ -99,6 +100,8 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
        switch (reason) {

        switch (reason) {

            case PROMPT_REASON_RESTART:

            case PROMPT_REASON_RESTART:

                return R.string.kg_prompt_reason_restart_password;

                return R.string.kg_prompt_reason_restart_password;

            case PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE:

                return R.string.kg_prompt_after_update_password;

            case PROMPT_REASON_TIMEOUT:

            case PROMPT_REASON_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_DEVICE_ADMIN:

            case PROMPT_REASON_DEVICE_ADMIN:
@@ -106,7 +109,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
            case PROMPT_REASON_USER_REQUEST:

            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_password;

                return R.string.kg_prompt_after_user_lockdown_password;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_reason_timeout_password;

                return R.string.kg_prompt_unattended_update_password;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

packages/SystemUI/src/com/android/keyguard/KeyguardPatternViewController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -304,6 +304,9 @@ public class KeyguardPatternViewController 
            case PROMPT_REASON_RESTART:

            case PROMPT_REASON_RESTART:

                resId = R.string.kg_prompt_reason_restart_pattern;

                resId = R.string.kg_prompt_reason_restart_pattern;

                break;

                break;

            case PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE:

                resId = R.string.kg_prompt_after_update_pattern;

                break;

            case PROMPT_REASON_TIMEOUT:

            case PROMPT_REASON_TIMEOUT:

                resId = R.string.kg_prompt_reason_timeout_pattern;

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

                break;
@@ -314,7 +317,7 @@ public class KeyguardPatternViewController 
                resId = R.string.kg_prompt_after_user_lockdown_pattern;

                resId = R.string.kg_prompt_after_user_lockdown_pattern;

                break;

                break;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                resId = R.string.kg_prompt_reason_timeout_pattern;

                resId = R.string.kg_prompt_unattended_update_pattern;

                break;

                break;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                resId = R.string.kg_prompt_reason_timeout_pattern;

                resId = R.string.kg_prompt_reason_timeout_pattern;

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NONE; 
import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_PREPARE_FOR_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TRUSTAGENT_EXPIRED;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;

import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;
@@ -113,6 +114,8 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
        switch (reason) {

        switch (reason) {

            case PROMPT_REASON_RESTART:

            case PROMPT_REASON_RESTART:

                return R.string.kg_prompt_reason_restart_pin;

                return R.string.kg_prompt_reason_restart_pin;

            case PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE:

                return R.string.kg_prompt_after_update_pin;

            case PROMPT_REASON_TIMEOUT:

            case PROMPT_REASON_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_DEVICE_ADMIN:

            case PROMPT_REASON_DEVICE_ADMIN:
@@ -120,7 +123,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
            case PROMPT_REASON_USER_REQUEST:

            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_pin;

                return R.string.kg_prompt_after_user_lockdown_pin;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_reason_timeout_pin;

                return R.string.kg_prompt_unattended_update_pin;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityView.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,12 @@ public interface KeyguardSecurityView { 
     */

     */

    int PROMPT_REASON_PRIMARY_AUTH_LOCKED_OUT = 15;

    int PROMPT_REASON_PRIMARY_AUTH_LOCKED_OUT = 15;





    /**

     * Strong auth is required because the device has just booted because of an automatic

     * mainline update.

     */

    int PROMPT_REASON_RESTART_FOR_MAINLINE_UPDATE = 16;



    /**

    /**

     * Reset the view and prepare to take input. This should do things like clearing the

     * Reset the view and prepare to take input. This should do things like clearing the

     * password or pattern and clear error messages.

     * password or pattern and clear error messages.