Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
This introduces problems when scrolling through preference screens, due
to a clash in this cache versus the ListView's cache.
This reverts commit 01dbc2ed55a081d41d233e891ea1ea1b0484f383.
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index cebb75c..08a2a9f 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -102,7 +102,6 @@
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 @@
if (!mHasSpecifiedLayout) {
mHasSpecifiedLayout = true;
}
- mLayoutView = null;
+
mLayoutResId = layoutResId;
}
@@ -361,7 +360,6 @@
* @see #setLayoutResource(int)
*/
public void setWidgetLayoutResource(int widgetLayoutResId) {
- mLayoutView = null;
mWidgetLayoutResId = widgetLayoutResId;
}
@@ -389,10 +387,7 @@
*/
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;