diff options
| author | Santiago Etchebehere <santie@google.com> | 2019-06-07 16:36:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-07 16:36:22 +0000 |
| commit | 212e2635bce11faa396074bf91e79c17d4e0836a (patch) | |
| tree | 4248fa9688affc3f6d34ebd057196fd9f2cf55e7 | |
| parent | ddf9d24bbc9e509dda8591b8d280cd6fb28c5cea (diff) | |
| parent | dcab1eafa3411d97d40eba9d6a97aa6dbfaa5a65 (diff) | |
| download | ThemePicker-212e2635bce11faa396074bf91e79c17d4e0836a.tar.gz | |
Merge "Correctly remove ViewPager views" into ub-launcher3-qt-r1-dev
| -rw-r--r-- | src/com/android/customization/picker/BasePreviewAdapter.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/customization/picker/BasePreviewAdapter.java b/src/com/android/customization/picker/BasePreviewAdapter.java index e87fb71d..53f750a1 100644 --- a/src/com/android/customization/picker/BasePreviewAdapter.java +++ b/src/com/android/customization/picker/BasePreviewAdapter.java @@ -88,7 +88,11 @@ public class BasePreviewAdapter<T extends PreviewPage> extends PagerAdapter { @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); + } } /** |