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

Commit 7ae0a12d authored by Chandru S's avatar Chandru S Committed by Android (Google) Code Review
Browse files

Merge "Use the default message for unattended update scenario" into main

parents 58c3de52 bae9649a

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView { 
            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_password;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_unattended_update_password;

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_password;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED:

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

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ public class KeyguardPatternViewController 
                resId = R.string.kg_prompt_after_user_lockdown_pattern;

                break;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                resId = R.string.kg_prompt_unattended_update_pattern;

                resId = R.string.kg_prompt_reason_timeout_pattern;

                break;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                resId = R.string.kg_prompt_reason_timeout_pattern;

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
            case PROMPT_REASON_USER_REQUEST:

                return R.string.kg_prompt_after_user_lockdown_pin;

            case PROMPT_REASON_PREPARE_FOR_UPDATE:

                return R.string.kg_prompt_unattended_update_pin;

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_NON_STRONG_BIOMETRIC_TIMEOUT:

                return R.string.kg_prompt_reason_timeout_pin;

            case PROMPT_REASON_TRUSTAGENT_EXPIRED: