Merge "Fix 3298889: Show continue button on PIN and password screens" into honeycomb

This commit is contained in:
Jim Miller
2011-01-11 13:50:40 -08:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 6 deletions

View File

@@ -218,8 +218,8 @@ public class ChooseLockPassword extends PreferenceActivity {
// 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;
int id = mIsAlphaMode ? R.string.lockpassword_choose_your_password_header
: R.string.lockpassword_choose_your_pin_header;
CharSequence title = getText(id);
preferenceActivity.showBreadCrumbs(title, title);
}