Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens."

2010-10-27 11:04:43 -07:00
parent 05e148360b 27da0bf0a3
commit 29ab7d8501
6 changed files with 92 additions and 67 deletions
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -151,7 +151,7 @@ public abstract class PreferenceFragment extends Fragment implements
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
            Bundle savedInstanceState) {
-        return inflater.inflate(com.android.internal.R.layout.preference_list_content,
+        return inflater.inflate(com.android.internal.R.layout.preference_list_fragment,
                container, false);
    }