diff options
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 1 | ||||
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index fb5570ed8..ab46e0268 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1089,7 +1089,6 @@ public class CameraActivity extends Activity @Override public void onPause() { // Delete photos that are pending deletion - mFilmStripView.getController().clearSurfaceViews(); performDeletion(); mOrientationListener.disable(); mCurrentModule.onPauseBeforeSuper(); diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index d2695b5a4..074f80b8a 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -408,8 +408,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { public void goToFilmStrip(); public void goToFullScreen(); - - public void clearSurfaceViews(); } /** @@ -2332,19 +2330,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { scaleTo(1f, GEOMETRY_ADJUST_TIME_MS); } - @Override - public void clearSurfaceViews() { - for(ViewItem item: mViewItem) { - if (item == null) { - continue; - } - View v = item.getView(); - if (v != mCameraView) { - removeView(v); - } - } - } - private void cancelFlingAnimation() { // Cancels flinging for zoomed images if (isFlingAnimationRunning()) { |