summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsPreferenceFragment.java
diff options
context:
space:
mode:
authorUdam Saini <udam@google.com>2016-02-16 17:54:13 -0800
committerUdam Saini <udam@google.com>2016-02-19 16:28:34 -0800
commitd553abcb4cd4ee3682ae4e864c06514d65fcb253 (patch)
treed8895dab76ef22b4cca1a5e5bd23d3e9abe60cd2 /src/com/android/settings/SettingsPreferenceFragment.java
parent18d98653883d4d28f8700588c3f4aad91f47411e (diff)
downloadpackages_apps_Settings-d553abcb4cd4ee3682ae4e864c06514d65fcb253.tar.gz
packages_apps_Settings-d553abcb4cd4ee3682ae4e864c06514d65fcb253.tar.bz2
packages_apps_Settings-d553abcb4cd4ee3682ae4e864c06514d65fcb253.zip
Moves the encryption interstitial to use the list layout
bug:27206957 Change-Id: Ib577440a2696539f44021bb4ba0100e9f1699c6c
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r--src/com/android/settings/SettingsPreferenceFragment.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 49d72b48be..e871c82b0b 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -242,9 +242,18 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
protected void setHeaderView(int resource) {
mHeader = new LayoutPreference(getPrefContext(), resource);
- mHeader.setOrder(ORDER_FIRST);
+ addPreferenceToTop(mHeader);
+ }
+
+ protected void setHeaderView(View view) {
+ mHeader = new LayoutPreference(getPrefContext(), view);
+ addPreferenceToTop(mHeader);
+ }
+
+ private void addPreferenceToTop(LayoutPreference preference) {
+ preference.setOrder(ORDER_FIRST);
if (getPreferenceScreen() != null) {
- getPreferenceScreen().addPreference(mHeader);
+ getPreferenceScreen().addPreference(preference);
}
}