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

Merge "Update the text shown when admin disabled fingerprint as unlock option."

Browse Source
This commit is contained in:
Sudheer Shanka
2016-01-26 22:36:06 +00:00
committed by Android (Google) Code Review
parent 49e9f612d1 5590e2eb44
commit a78572cf39
6 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -62,6 +62,9 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
private String mHelpUri;
private static final int ORDER_FIRST = -1;
private static final int ORDER_LAST = Integer.MAX_VALUE -1;
// Cache the content resolver for async callbacks
private ContentResolver mContentResolver;
@@ -228,7 +231,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
protected void setHeaderView(int resource) {
mHeader = new LayoutPreference(getPrefContext(), resource);
mHeader.setOrder(-1);
mHeader.setOrder(ORDER_FIRST);
if (getPreferenceScreen() != null) {
getPreferenceScreen().addPreference(mHeader);
}
@@ -248,7 +251,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
}
if (footer != null) {
mFooter = footer;
mFooter.setOrder(Integer.MAX_VALUE);
mFooter.setOrder(ORDER_LAST);
if (getPreferenceScreen() != null) {
getPreferenceScreen().addPreference(mFooter);
}