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

Gray out confirm button on pattern/pin/password set dialog

Browse Source 
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.

Note that this requires async tasks so that the button is shown as gray
in a timely way.

Also don't add another stage - this causes a11y to repeat the title.

Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
This commit is contained in:
Paul Lawrence
2015-08-03 09:44:23 -07:00
parent 18d8682802
commit cff37ecbdd
2 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/com/android/settings/ChooseLockPattern.java
View File

@@ -346,7 +346,6 @@ public class ChooseLockPattern extends SettingsActivity {
}
private Stage mUiStage = Stage.Introduction;
private boolean mDone = false;
private Runnable mClearPatternRunnable = new Runnable() {
public void run() {
@@ -435,7 +434,6 @@ public class ChooseLockPattern extends SettingsActivity {
}
updateStage(Stage.values()[savedInstanceState.getInt(KEY_UI_STAGE)]);
}
mDone = false;
}
@Override
@@ -483,7 +481,7 @@ public class ChooseLockPattern extends SettingsActivity {
throw new IllegalStateException("expected ui stage " + Stage.ChoiceConfirmed
+ " when button is " + RightButtonMode.Confirm);
}
saveChosenPatternAndFinish();
new SaveChosenPatternAndFinish().execute();
} else if (mUiStage.rightMode == RightButtonMode.Ok) {
if (mUiStage != Stage.HelpScreen) {
throw new IllegalStateException("Help screen is only mode with ok button, "
@@ -623,34 +621,49 @@ public class ChooseLockPattern extends SettingsActivity {
mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
}
private void saveChosenPatternAndFinish() {
if (mDone) return;
LockPatternUtils utils = mChooseLockSettingsHelper.utils();
final boolean lockVirgin = !utils.isPatternEverChosen(UserHandle.myUserId());
private class SaveChosenPatternAndFinish extends AsyncTask<Void,Void,Void> {
boolean mLockVirgin;
LockPatternUtils mUtils;
boolean mWasSecureBefore;
boolean wasSecureBefore = utils.isSecure(UserHandle.myUserId());
@Override
protected void onPreExecute(){
setRightButtonEnabled(false);
mUtils = mChooseLockSettingsHelper.utils();
mLockVirgin = !mUtils.isPatternEverChosen(UserHandle.myUserId());
final boolean required = getActivity().getIntent().getBooleanExtra(
mWasSecureBefore = mUtils.isSecure(UserHandle.myUserId());
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
utils.setCredentialRequiredToDecrypt(required);
utils.saveLockPattern(mChosenPattern, mCurrentPattern, UserHandle.myUserId());
if (lockVirgin) {
utils.setVisiblePatternEnabled(true, UserHandle.myUserId());
mUtils.setCredentialRequiredToDecrypt(required);
}
if (mHasChallenge) {
startVerifyPattern(utils, wasSecureBefore);
} else {
if (!wasSecureBefore) {
Intent intent = getRedactionInterstitialIntent(getActivity());
if (intent != null) {
startActivity(intent);
}
@Override
protected Void doInBackground(Void... params){
mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, UserHandle.myUserId());
return null;
}
@Override
protected void onPostExecute(Void param) {
if (mLockVirgin) {
mUtils.setVisiblePatternEnabled(true, UserHandle.myUserId());
}
if (mHasChallenge) {
startVerifyPattern(mUtils, mWasSecureBefore);
} else {
if (!mWasSecureBefore) {
Intent intent = getRedactionInterstitialIntent(getActivity());
if (intent != null) {
startActivity(intent);
}
}
getActivity().setResult(RESULT_FINISHED);
doFinish();
}
getActivity().setResult(RESULT_FINISHED);
doFinish();
}
}
@@ -693,7 +706,6 @@ public class ChooseLockPattern extends SettingsActivity {
private void doFinish() {
getActivity().finish();
mDone = true;
}
}
}