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

Fix 3281395: Use breadcrumb area to display title for LockScreen

Browse Source 
Change-Id: Icd631b4c70e7b9f6b9a8c24dd513aed259a22d6a
This commit is contained in:
Jim Miller
2010-12-17 18:23:23 -08:00
parent 10fa99fe55
commit 9757e30dfa
6 changed files with 102 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
AndroidManifest.xml
View File

@@ -710,24 +710,33 @@
<!-- Second and third-level settings --> <!-- Second and third-level settings -->
<activity android:name="ConfirmLockPattern"/>
<activity android:name="ConfirmLockPassword"/>> <!-- Lock screen settings -->
<activity android:name="ConfirmLockPattern"
android:label="@string/lockpassword_confirm_your_pattern_header"/>
<activity android:name="ChooseLockGeneric"> <activity android:name="ConfirmLockPassword"
android:label="@string/lockpassword_confirm_your_password_header"/>>
<activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header">
<intent-filter> <intent-filter>
<action android:name="android.app.action.SET_NEW_PASSWORD" /> <action android:name="android.app.action.SET_NEW_PASSWORD" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="ChooseLockPattern" android:exported="false"/> <activity android:name="ChooseLockPattern" android:exported="false"
android:label="@string/lockpassword_choose_your_pattern_header"/>
<activity android:name="ChooseLockPassword" android:exported="false"/> <activity android:name="ChooseLockPassword" android:exported="false"
android:label="@string/lockpassword_choose_your_password_header"/>
<activity android:name="ChooseLockPatternTutorial"/> <activity android:name="ChooseLockPatternTutorial"
android:label="@string/lockpassword_choose_your_pattern_header"/>
<activity android:name="ChooseLockPatternExample"/> <activity android:name="ChooseLockPatternExample"
android:label="@string/lockpassword_choose_your_pattern_header"/>
<!-- Runs in the phone process since it needs access to the Phone object --> <!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.Status" <activity android:name=".deviceinfo.Status"

33
res/layout-xlarge/choose_lock_password.xml
View File

@@ -74,25 +74,36 @@
android:visibility="gone" android:visibility="gone"
/> />
<View
android:layout_width="match_parent"
android:layout_height="0dip"
/>
<RelativeLayout <RelativeLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent"> android:layout_width="match_parent">
<Button android:id="@+id/cancel_button" <LinearLayout
android:layout_width="150dip" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dip" android:layout_alignParentRight="true"
android:layout_alignParentLeft="true" android:orientation="horizontal">
android:text="@string/lockpassword_cancel_label"
/> <Button android:id="@+id/cancel_button"
android:layout_width="140dip"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="150dip" android:layout_width="140dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dip" android:ellipsize="marquee"
android:layout_alignParentRight="true" android:singleLine="true"
android:text="@string/lockpassword_continue_label" android:text="@string/lockpassword_continue_label"/>
/>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

35
res/layout-xlarge/confirm_lock_password.xml
View File

@@ -77,27 +77,36 @@
android:visibility="gone" android:visibility="gone"
/> />
<View
android:layout_width="match_parent"
android:layout_height="0dip"
/>
<RelativeLayout <RelativeLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent"> android:layout_width="match_parent">
<Button android:id="@+id/cancel_button" <LinearLayout
android:layout_width="150dip" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dip" android:layout_alignParentRight="true"
android:layout_alignParentLeft="true" android:orientation="horizontal">
android:text="@string/lockpassword_cancel_label"
/> <Button android:id="@+id/cancel_button"
android:layout_width="140dip"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:text="@string/lockpassword_cancel_label"/>
<Button android:id="@+id/next_button" <Button android:id="@+id/next_button"
android:layout_width="150dip" android:layout_width="140dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dip" android:ellipsize="marquee"
android:layout_alignParentRight="true" android:singleLine="true"
android:drawableRight="@drawable/ic_btn_next" android:text="@string/lockpassword_continue_label"/>
android:drawablePadding="10dip"
android:text="@string/lockpassword_continue_label" </LinearLayout>
/>
</RelativeLayout> </RelativeLayout>

18
res/values/strings.xml
View File

@@ -1789,18 +1789,24 @@
<string name="settings_safetylegal_activity_loading">Loading\u2026</string> <string name="settings_safetylegal_activity_loading">Loading\u2026</string>
<!-- Lock Pattern settings --> <!-- Lock Pattern settings -->
<!-- Header on first screen of choose password/PIN flow --> <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
<string name="lockpassword_choose_your_password_header">Choose your password</string> <string name="lockpassword_choose_your_password_header">Choose your password</string>
<!-- Header on first screen of choose password/PIN flow --> <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
<string name="lockpassword_choose_your_pattern_header">Choose your pattern</string>
<!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
<string name="lockpassword_choose_your_pin_header">Choose your PIN</string> <string name="lockpassword_choose_your_pin_header">Choose your PIN</string>
<!-- Header on password confirm screen --> <!-- Header on password confirm screen [CHAR LIMIT=30] -->
<string name="lockpassword_confirm_your_password_header">Confirm your password</string> <string name="lockpassword_confirm_your_password_header">Confirm your password</string>
<!-- Header on password confirm screen --> <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
<string name="lockpassword_confirm_your_pattern_header">Confirm your pattern</string>
<!-- Header on password confirm screen [CHAR LIMIT=30] -->
<string name="lockpassword_confirm_your_pin_header">Confirm your PIN</string> <string name="lockpassword_confirm_your_pin_header">Confirm your PIN</string>
<!-- Header on password confirm screen if second password doesn't match the first. --> <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
<string name="lockpassword_confirm_passwords_dont_match">Passwords don\'t match</string> <string name="lockpassword_confirm_passwords_dont_match">Passwords don\'t match</string>
<!-- Header on pin confirm screen if second pin doesn't match the first. --> <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
<string name="lockpassword_confirm_pins_dont_match">PINs don\'t match</string> <string name="lockpassword_confirm_pins_dont_match">PINs don\'t match</string>
<!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
<string name="lockpassword_choose_lock_generic_header">Unlock selection</string>
<!-- Toast shown if setting password was successful --> <!-- Toast shown if setting password was successful -->
<string name="lockpassword_password_set_toast">Password has been set</string> <string name="lockpassword_password_set_toast">Password has been set</string>
<!-- Toast shown if setting PIN was successful --> <!-- Toast shown if setting PIN was successful -->

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

@@ -183,7 +183,8 @@ public class ChooseLockPassword extends PreferenceActivity {
mPasswordEntry.setOnEditorActionListener(this); mPasswordEntry.setOnEditorActionListener(this);
mPasswordEntry.addTextChangedListener(this); mPasswordEntry.addTextChangedListener(this);
mKeyboardHelper = new PasswordEntryKeyboardHelper(getActivity(), final Activity activity = getActivity();
mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
mKeyboardView, mPasswordEntry); mKeyboardView, mPasswordEntry);
mKeyboardHelper.setKeyboardMode(mIsAlphaMode ? mKeyboardHelper.setKeyboardMode(mIsAlphaMode ?
PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
@@ -212,6 +213,14 @@ public class ChooseLockPassword extends PreferenceActivity {
updateStage(mUiStage); updateStage(mUiStage);
} }
} }
// Update the breadcrumb (title) if this is embedded in a PreferenceActivity
if (activity instanceof PreferenceActivity) {
final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
int id = mIsAlphaMode ? R.string.lockpassword_confirm_your_password_header
: R.string.lockpassword_confirm_your_pin_header;
CharSequence title = getText(id);
preferenceActivity.showBreadCrumbs(title, title);
}
return view; return view;
} }

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

@@ -20,6 +20,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.PasswordEntryKeyboardHelper; import com.android.internal.widget.PasswordEntryKeyboardHelper;
import com.android.internal.widget.PasswordEntryKeyboardView; import com.android.internal.widget.PasswordEntryKeyboardView;
import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.Intent; import android.content.Intent;
@@ -94,9 +95,12 @@ public class ConfirmLockPassword extends PreferenceActivity {
|| DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality; || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
mHeaderText.setText(isAlpha ? R.string.lockpassword_confirm_your_password_header mHeaderText.setText(isAlpha ? R.string.lockpassword_confirm_your_password_header
: R.string.lockpassword_confirm_your_pin_header); : R.string.lockpassword_confirm_your_pin_header);
mKeyboardHelper = new PasswordEntryKeyboardHelper(getActivity(),
final Activity activity = getActivity();
mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
mKeyboardView, mPasswordEntry); mKeyboardView, mPasswordEntry);
mKeyboardHelper.setKeyboardMode(isAlpha ? PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA mKeyboardHelper.setKeyboardMode(isAlpha ?
PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
: PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC); : PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
mKeyboardView.requestFocus(); mKeyboardView.requestFocus();
@@ -104,6 +108,15 @@ public class ConfirmLockPassword extends PreferenceActivity {
mPasswordEntry.setInputType(isAlpha ? currentType mPasswordEntry.setInputType(isAlpha ? currentType
: (currentType | InputType.TYPE_CLASS_NUMBER)); : (currentType | InputType.TYPE_CLASS_NUMBER));
// Update the breadcrumb (title) if this is embedded in a PreferenceActivity
if (activity instanceof PreferenceActivity) {
final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
int id = isAlpha ? R.string.lockpassword_confirm_your_password_header
: R.string.lockpassword_confirm_your_pin_header;
CharSequence title = getText(id);
preferenceActivity.showBreadCrumbs(title, title);
}
return view; return view;
} }