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

Merge "Fix 3148496: Update LockScreen layouts on large device"

Browse Source
This commit is contained in:
Jim Miller
2010-12-15 14:37:33 -08:00
committed by Android (Google) Code Review
parent ac0ed0a0be 2e28acedc6
commit e201a54c53
11 changed files with 215 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ChooseLockPassword.java
View File

@@ -29,6 +29,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceActivity;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;
import android.text.Spannable;
import android.text.TextUtils;
@@ -191,6 +192,10 @@ public class ChooseLockPassword extends PreferenceActivity {
mHeaderText = (TextView) view.findViewById(R.id.headerText);
mKeyboardView.requestFocus();
int currentType = mPasswordEntry.getInputType();
mPasswordEntry.setInputType(mIsAlphaMode ? currentType
: (currentType | InputType.TYPE_CLASS_NUMBER));
Intent intent = getActivity().getIntent();
final boolean confirmCredentials = intent.getBooleanExtra("confirm_credentials", true);
if (savedInstanceState == null) {

6
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -26,6 +26,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceActivity;
import android.text.InputType;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -98,6 +99,11 @@ public class ConfirmLockPassword extends PreferenceActivity {
mKeyboardHelper.setKeyboardMode(isAlpha ? PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
: PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
mKeyboardView.requestFocus();
int currentType = mPasswordEntry.getInputType();
mPasswordEntry.setInputType(isAlpha ? currentType
: (currentType | InputType.TYPE_CLASS_NUMBER));
return view;
}