diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-13 23:35:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 23:35:55 +0000 |
| commit | bf6d50f906b33a7ace8a04f6b87826a8dca05db9 (patch) | |
| tree | 3b568e52b80211144ff8d1610d133bff1febc92b | |
| parent | 4f5e024875a60d210ba3bb0322148db630adb53c (diff) | |
| parent | c73a1aaa90694c66feefc59557b35f5913ef1b04 (diff) | |
| download | frameworks_base-bf6d50f906b33a7ace8a04f6b87826a8dca05db9.zip frameworks_base-bf6d50f906b33a7ace8a04f6b87826a8dca05db9.tar.gz frameworks_base-bf6d50f906b33a7ace8a04f6b87826a8dca05db9.tar.bz2 | |
Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 9903b7e..70dd971 100644 --- 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(); } } |