Merge \"Fix PIN screen title\" into nyc-mr1-dev
am: 79321c480f
Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user