diff options
| author | Santiago Etchebehere <santie@google.com> | 2022-04-01 16:33:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-01 16:33:33 +0000 |
| commit | 64ebc35b0b1af5bf12b93c058250654bdaa90310 (patch) | |
| tree | 436422c3627e1142af09663bdeef3eeda47023bf /src | |
| parent | bdf34222091e3c93da462bbe1ba4d4dbcb17d9d8 (diff) | |
| parent | 731a7c82755564442319468af9e972e2e1822494 (diff) | |
| download | ThemePicker-64ebc35b0b1af5bf12b93c058250654bdaa90310.tar.gz | |
Merge "Always recreate the SurfaceView when updating the grid preview" into tm-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/customization/picker/grid/GridOptionPreviewer.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/com/android/customization/picker/grid/GridOptionPreviewer.java b/src/com/android/customization/picker/grid/GridOptionPreviewer.java index 8de08cfd..5cf327ed 100644 --- a/src/com/android/customization/picker/grid/GridOptionPreviewer.java +++ b/src/com/android/customization/picker/grid/GridOptionPreviewer.java @@ -64,16 +64,17 @@ class GridOptionPreviewer { if (mSurfaceCallback != null) { mSurfaceCallback.cleanUp(); mSurfaceCallback.resetLastSurface(); + if (mGridOptionSurface != null) { + mGridOptionSurface.getHolder().removeCallback(mSurfaceCallback); + } } - if (mGridOptionSurface == null) { - mGridOptionSurface = new SurfaceView(mPreviewContainer.getContext()); - mGridOptionSurface.setLayoutParams(new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); - mGridOptionSurface.setZOrderMediaOverlay(true); - mSurfaceCallback = new GridOptionSurfaceHolderCallback(mGridOptionSurface, - mGridOptionSurface.getContext()); - mGridOptionSurface.getHolder().addCallback(mSurfaceCallback); - } + mGridOptionSurface = new SurfaceView(mPreviewContainer.getContext()); + mGridOptionSurface.setLayoutParams(new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); + mGridOptionSurface.setZOrderMediaOverlay(true); + mSurfaceCallback = new GridOptionSurfaceHolderCallback(mGridOptionSurface, + mGridOptionSurface.getContext()); + mGridOptionSurface.getHolder().addCallback(mSurfaceCallback); mPreviewContainer.addView(mGridOptionSurface); } |