diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index cebb75c6e37fd..08a2a9f37aaa4 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -102,7 +102,6 @@ public class Preference implements Comparable, OnDependencyChangeLis private int mLayoutResId = com.android.internal.R.layout.preference; private int mWidgetLayoutResId; private boolean mHasSpecifiedLayout = false; - private View mLayoutView; private OnPreferenceChangeInternalListener mListener; @@ -337,7 +336,7 @@ public class Preference implements Comparable, OnDependencyChangeLis if (!mHasSpecifiedLayout) { mHasSpecifiedLayout = true; } - mLayoutView = null; + mLayoutResId = layoutResId; } @@ -361,7 +360,6 @@ public class Preference implements Comparable, OnDependencyChangeLis * @see #setLayoutResource(int) */ public void setWidgetLayoutResource(int widgetLayoutResId) { - mLayoutView = null; mWidgetLayoutResId = widgetLayoutResId; } @@ -389,10 +387,7 @@ public class Preference implements Comparable, OnDependencyChangeLis */ public View getView(View convertView, ViewGroup parent) { if (convertView == null) { - if (mLayoutView == null) { - mLayoutView = onCreateView(parent); - } - convertView = mLayoutView; + convertView = onCreateView(parent); } onBindView(convertView); return convertView;