PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Settings ChooseLockscreen* dismiss in background."

Browse Source 
This reverts commit 302aa72446.

Reason for revert: b/308468754

Change-Id: I27ab7e374324b99e7a039b06ad698c214d97592a
This commit is contained in:
Chun-Wei Wang
2023-10-31 06:59:48 +00:00
committed by Android (Google) Code Review
parent 302aa72446
commit d1de1b532b
6 changed files with 14 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/password/ChooseLockGeneric.java
View File

@@ -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);

7
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -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 {

8
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -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;

24
tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
View File

@@ -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<ChooseLockPassword> 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) {

28
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -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<ChooseLockPassword> 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) {

26
tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
View File

@@ -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<ChooseLockPattern> 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()));