From 7bed781be5651bb33b79de801c72ec3340b4d070 Mon Sep 17 00:00:00 2001 From: Erin Yan Date: Thu, 29 Aug 2019 16:00:47 -0700 Subject: [PATCH] Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper Bug: 140231719 Test: Manually on IHU Change-Id: I5e848ca3183f624158dc192159f57aaa9d27a89c --- .../car/CarTrustAgentUnlockDialogHelper.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java index 78bb1bcf24a87..013c63b834ffb 100644 --- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java +++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarTrustAgentUnlockDialogHelper.java @@ -192,23 +192,28 @@ class CarTrustAgentUnlockDialogHelper extends BroadcastReceiver{ } } - // Set button text based on security lock type + // Set button text based on screen lock type private void setButtonText() { LockPatternUtils lockPatternUtils = new LockPatternUtils(mContext); int passwordQuality = lockPatternUtils.getActivePasswordQuality(mUid); switch (passwordQuality) { // PIN + case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX: + mButton.setText(R.string.unlock_dialog_button_text_pin); + break; // Pattern case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: mButton.setText(R.string.unlock_dialog_button_text_pattern); break; // Password - case DevicePolicyManager.PASSWORD_QUALITY_MANAGED: + case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: + case DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC: + case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX: mButton.setText(R.string.unlock_dialog_button_text_password); break; default: - Log.e(TAG, "Encountered unexpected security type when attempting to set " + Log.e(TAG, "Encountered unexpected screen lock type when attempting to set " + "button text:" + passwordQuality); } }