am c6b6dd84: am bf6d50f9: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

* commit 'c6b6dd84fed5522ef01bd733f88b4e2a3110e820': Call dispatchFinishTemporaryDetach before returning a transient view
2015-05-14 00:43:10 +00:00
parent 007324bf82 c6b6dd84fe
commit b0b80305ab
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2353,8 +2353,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                }
            }

-            // Scrap view implies temporary detachment.
            isScrap[0] = true;
+
+            // Finish the temporary detach started in addScrapView().
+            transientView.dispatchFinishTemporaryDetach();
            return transientView;
        }

@@ -2367,7 +2369,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
            } else {
                isScrap[0] = true;

-                child.dispatchFinishTemporaryDetach();
+                // Finish the temporary detach started in addScrapView().
+                transientView.dispatchFinishTemporaryDetach();
            }
        }