summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ChooseLockPassword.java
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2014-12-03 15:17:46 -0800
committerMaurice Lam <yukl@google.com>2014-12-04 12:20:47 -0800
commitaf103b4eb476881fb27cfb9b6dc94b3fa5e74f28 (patch)
tree3f3a3e033fd81fc5ec30bcca7a4c079a03c0acb2 /src/com/android/settings/ChooseLockPassword.java
parent3c00e18ba7425a1837a1e458f16e5192254a196b (diff)
downloadpackages_apps_Settings-af103b4eb476881fb27cfb9b6dc94b3fa5e74f28.zip
packages_apps_Settings-af103b4eb476881fb27cfb9b6dc94b3fa5e74f28.tar.gz
packages_apps_Settings-af103b4eb476881fb27cfb9b6dc94b3fa5e74f28.tar.bz2
[FRP] Use setup wizard nav bar buttons
Use setup wizard nav bar buttons instead of custom button bar for lock screen setup. Bug: 18482708 Change-Id: I471f475ebe6bc7ba8cfbd179daddd854c1b6982a
Diffstat (limited to 'src/com/android/settings/ChooseLockPassword.java')
-rw-r--r--src/com/android/settings/ChooseLockPassword.java22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2c05986..fa1c678 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -24,14 +24,12 @@ import com.android.settings.notification.RedactionInterstitial;
import android.app.Activity;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.inputmethodservice.KeyboardView;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.provider.Settings;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;
@@ -416,7 +414,7 @@ public class ChooseLockPassword extends SettingsActivity {
return null;
}
- private void handleNext() {
+ public void handleNext() {
if (mDone) return;
final String pin = mPasswordEntry.getText().toString();
@@ -460,6 +458,14 @@ public class ChooseLockPassword extends SettingsActivity {
}
}
+ protected void setNextEnabled(boolean enabled) {
+ mNextButton.setEnabled(enabled);
+ }
+
+ protected void setNextText(int text) {
+ mNextButton.setText(text);
+ }
+
public void onClick(View v) {
switch (v.getId()) {
case R.id.next_button:
@@ -502,22 +508,22 @@ public class ChooseLockPassword extends SettingsActivity {
String msg = getString(mIsAlphaMode ? R.string.lockpassword_password_too_short
: R.string.lockpassword_pin_too_short, mPasswordMinLength);
mHeaderText.setText(msg);
- mNextButton.setEnabled(false);
+ setNextEnabled(false);
} else {
String error = validatePassword(password);
if (error != null) {
mHeaderText.setText(error);
- mNextButton.setEnabled(false);
+ setNextEnabled(false);
} else {
mHeaderText.setText(R.string.lockpassword_press_continue);
- mNextButton.setEnabled(true);
+ setNextEnabled(true);
}
}
} else {
mHeaderText.setText(mIsAlphaMode ? mUiStage.alphaHint : mUiStage.numericHint);
- mNextButton.setEnabled(length > 0);
+ setNextEnabled(length > 0);
}
- mNextButton.setText(mUiStage.buttonText);
+ setNextText(mUiStage.buttonText);
}
public void afterTextChanged(Editable s) {