From aaa031bd71f784d6a38f1a19ab88a5924c9060ba Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Thu, 1 Jul 2021 16:54:00 +0800 Subject: [PATCH] Correct the choose screen lock page The choose screen lock page didn't apply the right theme during the enterprise flow. That is because an intent extra of setup wizard wasn't properly passed to the next page. In this change we made sure the intent extra is able to properly pass to the next page. We also removed the wrong theme for setup choose a screen lock page since the wrong theme made this page broken. The setup choose a screen lock is a sub setting page that wasn't implemented by using SUW library, so it should not use GlifLayout theme. With this update, the choose a screen lock page still keeps the background color of Settings, that is different from the one of setup flow. Bug: 190499041 Test: manual test Change-Id: I9dceee6a398c7e7b487dd8e4046f71f76cc50e36 --- AndroidManifest.xml | 1 - src/com/android/settings/password/SetNewPasswordActivity.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 60dbb246044..4a37e2b41e1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1910,7 +1910,6 @@ diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java index 87411751bff..22825872128 100644 --- a/src/com/android/settings/password/SetNewPasswordActivity.java +++ b/src/com/android/settings/password/SetNewPasswordActivity.java @@ -134,6 +134,8 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo intent.putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true); } intent.putExtra(EXTRA_KEY_DEVICE_PASSWORD_REQUIREMENT_ONLY, mDevicePasswordRequirementOnly); + // Copy the setup wizard intent extra to the intent. + WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent); startActivity(intent); finish(); }