From d1de1b532b4dea449dbb7c9fc0f28a09f54503c0 Mon Sep 17 00:00:00 2001 From: Chun-Wei Wang Date: Tue, 31 Oct 2023 06:59:48 +0000 Subject: [PATCH] Revert "Settings ChooseLockscreen* dismiss in background." This reverts commit 302aa7244680de9eed47f20d02a37b0ce587ba26. Reason for revert: b/308468754 Change-Id: I27ab7e374324b99e7a039b06ad698c214d97592a --- .../settings/password/ChooseLockGeneric.java | 8 ------ .../settings/password/ChooseLockPassword.java | 7 ----- .../settings/password/ChooseLockPattern.java | 8 ------ .../password/ChooseLockGenericTest.java | 24 +++------------- .../password/ChooseLockPasswordTest.java | 28 ++++--------------- .../password/ChooseLockPatternTest.java | 26 ++++------------- 6 files changed, 14 insertions(+), 87 deletions(-) diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index 714f3ee8b89..0bf1255b3b9 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -200,14 +200,6 @@ public class ChooseLockGeneric extends SettingsActivity { return SettingsEnums.CHOOSE_LOCK_GENERIC; } - @Override - public void onPause() { - super.onPause(); - if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) { - finish(); - } - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index e74a2ff3a1a..800adb063cb 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -219,13 +219,6 @@ public class ChooseLockPassword extends SettingsActivity { findViewById(R.id.content_parent).setFitsSystemWindows(false); getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } - @Override - public void onPause() { - super.onPause(); - if (!isChangingConfigurations()) { - finish(); - } - } public static class ChooseLockPasswordFragment extends InstrumentedFragment implements OnEditorActionListener, TextWatcher, SaveAndFinishWorker.Listener { diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index f0c432e9465..20d1e7d8cd1 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -98,14 +98,6 @@ public class ChooseLockPattern extends SettingsActivity { return modIntent; } - @Override - public void onPause() { - super.onPause(); - if (!isChangingConfigurations()) { - finish(); - } - } - public static class IntentBuilder { private final Intent mIntent; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java index a099a393349..e625827d4a6 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java @@ -54,9 +54,7 @@ import android.os.Bundle; import android.provider.Settings.Global; import androidx.annotation.Nullable; -import androidx.lifecycle.Lifecycle; import androidx.preference.Preference; -import androidx.test.core.app.ActivityScenario; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockscreenCredential; @@ -615,29 +613,15 @@ public class ChooseLockGenericTest { mFragment.getString(R.string.face_unlock_set_unlock_password)); } - @Test - public void activity_dismisses_InBackground() { - ActivityScenario scenario = - ActivityScenario.launchActivityForResult(getChooseLockGenericIntent(null)); - scenario.moveToState(Lifecycle.State.RESUMED); - scenario.moveToState(Lifecycle.State.CREATED); - assertThat(scenario.getResult()).isNotNull(); - } - private void initActivity(@Nullable Intent intent) { - final Intent theIntent = getChooseLockGenericIntent(intent); - // TODO(b/275023433) This presents the activity from being made 'visible` is workaround - mActivity = Robolectric.buildActivity(ChooseLockGeneric.InternalActivity.class, theIntent) - .create().start().postCreate(null).resume().get(); - mActivity.getSupportFragmentManager().beginTransaction().add(mFragment, null).commitNow(); - } - - private Intent getChooseLockGenericIntent(@Nullable Intent intent) { if (intent == null) { intent = new Intent(); } intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false); - return intent; + // TODO(b/275023433) This presents the activity from being made 'visible` is workaround + mActivity = Robolectric.buildActivity(ChooseLockGeneric.InternalActivity.class, intent) + .create().start().postCreate(null).resume().get(); + mActivity.getSupportFragmentManager().beginTransaction().add(mFragment, null).commitNow(); } private static String capitalize(final String input) { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index ed8179b235d..dea936d1602 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -47,9 +47,6 @@ import android.view.View; import android.widget.CheckBox; import android.widget.TextView; -import androidx.lifecycle.Lifecycle; -import androidx.test.core.app.ActivityScenario; - import com.android.internal.widget.LockscreenCredential; import com.android.settings.R; import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment; @@ -518,31 +515,16 @@ public class ChooseLockPasswordTest { assertThat(pinAutoConfirmOption.isChecked()).isFalse(); } - @Test - public void activity_dismisses_InBackground() { - ActivityScenario scenario = - ActivityScenario.launchActivityForResult(getLockPasswordIntent()); - scenario.moveToState(Lifecycle.State.RESUMED); - scenario.moveToState(Lifecycle.State.CREATED); - assertThat(scenario.getResult()).isNotNull(); - } - private ChooseLockPassword setupActivityWithPinTypeAndDefaultPolicy() { PasswordPolicy policy = new PasswordPolicy(); policy.quality = PASSWORD_QUALITY_UNSPECIFIED; return buildChooseLockPasswordActivity( - getLockPasswordIntent()); - } - - private Intent getLockPasswordIntent() { - PasswordPolicy policy = new PasswordPolicy(); - policy.quality = PASSWORD_QUALITY_UNSPECIFIED; - return new IntentBuilder(application) - .setUserId(UserHandle.myUserId()) - .setPasswordType(PASSWORD_QUALITY_NUMERIC) - .setPasswordRequirement(PASSWORD_COMPLEXITY_NONE, policy.getMinMetrics()) - .build(); + new IntentBuilder(application) + .setUserId(UserHandle.myUserId()) + .setPasswordType(PASSWORD_QUALITY_NUMERIC) + .setPasswordRequirement(PASSWORD_COMPLEXITY_NONE, policy.getMinMetrics()) + .build()); } private ChooseLockPassword buildChooseLockPasswordActivity(Intent intent) { diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index da12ee43c8a..7715c62b55b 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -30,9 +30,6 @@ import android.os.Bundle; import android.os.UserHandle; import android.view.View; -import androidx.lifecycle.Lifecycle; -import androidx.test.core.app.ActivityScenario; - import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockscreenCredential; import com.android.settings.R; @@ -140,29 +137,16 @@ public class ChooseLockPatternTest { R.string.lockpassword_draw_your_pattern_again_header)); } - @Test - public void activity_dismisses_InBackground() { - ActivityScenario scenario = - ActivityScenario.launchActivityForResult(getLockPatternIntent(false)); - scenario.moveToState(Lifecycle.State.RESUMED); - scenario.moveToState(Lifecycle.State.CREATED); - assertThat(scenario.getResult()).isNotNull(); - } - private ChooseLockPattern createActivity(boolean addFingerprintExtra) { return Robolectric.buildActivity( - ChooseLockPattern.class, - getLockPatternIntent(addFingerprintExtra)) + ChooseLockPattern.class, + new IntentBuilder(application) + .setUserId(UserHandle.myUserId()) + .setForFingerprint(addFingerprintExtra) + .build()) .setup().get(); } - private Intent getLockPatternIntent(boolean addFingerprintExtra) { - return new IntentBuilder(application) - .setUserId(UserHandle.myUserId()) - .setForFingerprint(addFingerprintExtra) - .build(); - } - private LockscreenCredential createPattern(String patternString) { return LockscreenCredential.createPattern(LockPatternUtils.byteArrayToPattern( patternString.getBytes()));