Merge "Fix PIN screen title" into nyc-mr1-dev

This commit is contained in:
Maurice Lam
2016-07-11 21:33:04 +00:00
committed by Android (Google) Code Review

View File

@@ -290,10 +290,7 @@ public class ChooseLockPassword extends SettingsActivity {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_password, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
return inflater.inflate(R.layout.choose_lock_password, container, false);
}
@Override
@@ -365,6 +362,7 @@ public class ChooseLockPassword extends SettingsActivity {
: R.string.lockpassword_choose_your_pin_header;
CharSequence title = getText(id);
sa.setTitle(title);
((GlifLayout) view).setHeaderText(title);
}
}