From bae6fc244732476d6e6b565e64518e1beafd66c6 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 30 Sep 2009 14:08:07 -0700
Subject: [PATCH] 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.
---
 core/java/android/preference/Preference.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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<Preference>, 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<Preference>, OnDependencyChangeLis
         if (!mHasSpecifiedLayout) {
             mHasSpecifiedLayout = true;
         }
-        mLayoutView = null;
+        
         mLayoutResId = layoutResId;
     }
     
@@ -361,7 +360,6 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
      * @see #setLayoutResource(int)
      */
     public void setWidgetLayoutResource(int widgetLayoutResId) {
-        mLayoutView = null;
         mWidgetLayoutResId = widgetLayoutResId;
     }
 
@@ -389,10 +387,7 @@ public class Preference implements Comparable<Preference>, 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;