Merge \\"Fix PIN screen title\\" into nyc-mr1-dev am: 79321c480f
am: 932b49408d
Change-Id: I5e7ecd3f4ad0af36622b16300f46dc155b0339b3
This commit is contained in:
@@ -290,10 +290,7 @@ public class ChooseLockPassword extends SettingsActivity {
|
|||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
GlifLayout layout = (GlifLayout) inflater.inflate(
|
return inflater.inflate(R.layout.choose_lock_password, container, false);
|
||||||
R.layout.choose_lock_password, container, false);
|
|
||||||
layout.setHeaderText(getActivity().getTitle());
|
|
||||||
return layout;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -365,6 +362,7 @@ public class ChooseLockPassword extends SettingsActivity {
|
|||||||
: R.string.lockpassword_choose_your_pin_header;
|
: R.string.lockpassword_choose_your_pin_header;
|
||||||
CharSequence title = getText(id);
|
CharSequence title = getText(id);
|
||||||
sa.setTitle(title);
|
sa.setTitle(title);
|
||||||
|
((GlifLayout) view).setHeaderText(title);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user