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

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

Browse Source 
am: 79321c480f

Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9
This commit is contained in:
Maurice Lam
2016-07-11 21:45:36 +00:00
committed by android-build-merger
parent 5922902ab3 79321c480f
commit 932b49408d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
} }
} }