commit 212e2635bce11faa396074bf91e79c17d4e0836a
author Santiago Etchebehere <santie@google.com> Fri Jun 07 16:36:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 07 16:36:22 2019 +0000
tree 4248fa9688affc3f6d34ebd057196fd9f2cf55e7
parent ddf9d24bbc9e509dda8591b8d280cd6fb28c5cea
parent dcab1eafa3411d97d40eba9d6a97aa6dbfaa5a65

Merge "Correctly remove ViewPager views" into ub-launcher3-qt-r1-dev

src/com/android/customization/picker/BasePreviewAdapter.java

diff --git a/src/com/android/customization/picker/BasePreviewAdapter.java b/src/com/android/customization/picker/BasePreviewAdapter.java
index e87fb71..53f750a 100644
--- a/src/com/android/customization/picker/BasePreviewAdapter.java
+++ b/src/com/android/customization/picker/BasePreviewAdapter.java
@@ -88,7 +88,11 @@
     @Override
     public void destroyItem(@NonNull ViewGroup container, int position,
             @NonNull Object object) {
-        ((T) object).card = null;
+        View card = ((PreviewPage) object).card;
+        ((PreviewPage) object).card = null;
+        if (card.getParent() == container) {
+            container.removeView(card);
+        }
     }
 
     /**