diff options
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index 3edb23d3c..01469baeb 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -2036,17 +2036,18 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } // Remove all views from the mViewItem buffer, except the camera view. - for (int i = 0; i < mViewItem.length; i++) { - if (mViewItem[i] == null) { - continue; - } - View v = mViewItem[i].getView(); - if (v != mCameraView) { - removeView(v); - } - ImageData imageData = mDataAdapter.getImageData(mViewItem[i].getId()); - if (imageData != null) { - imageData.recycle(); + for (final ViewItem item : mViewItem) { + if (item != null) { + ImageData imageData = mDataAdapter.getImageData(item.getId()); + if (imageData != null) { + imageData.recycle(); + View v = item.getView(); + if (imageData.getViewType() != ImageData.VIEW_TYPE_STICKY) { + removeView(v); + } else { + mCameraView = v; + } + } } } |