diff options
| author | Amith Yamasani <yamasani@google.com> | 2010-10-27 11:04:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-27 11:04:43 -0700 |
| commit | 29ab7d8501c671671af07e8bb5fbae86d2005eef (patch) | |
| tree | b885c14d76f6eef070a6c176a740c30cc05947c0 /core/java | |
| parent | 05e148360bede32eff4399a1a437ad0304ec68f1 (diff) | |
| parent | 27da0bf0a38231111cbf6bb7df6c4a0d53b144d8 (diff) | |
| download | frameworks_base-29ab7d8501c671671af07e8bb5fbae86d2005eef.zip frameworks_base-29ab7d8501c671671af07e8bb5fbae86d2005eef.tar.gz frameworks_base-29ab7d8501c671671af07e8bb5fbae86d2005eef.tar.bz2 | |
Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/preference/PreferenceFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 7629c31..33f37f8 100644 --- 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); } |