commit d553abcb4cd4ee3682ae4e864c06514d65fcb253
author Udam Saini <udam@google.com> Tue Feb 16 17:54:13 2016 -0800
committer Udam Saini <udam@google.com> Fri Feb 19 16:28:34 2016 -0800
tree d8895dab76ef22b4cca1a5e5bd23d3e9abe60cd2
parent 18d98653883d4d28f8700588c3f4aad91f47411e

Moves the encryption interstitial to use the list layout

bug:27206957
Change-Id: Ib577440a2696539f44021bb4ba0100e9f1699c6c

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 49d72b4..e871c82 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -242,9 +242,18 @@
 
     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);
         }
     }