summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java3
-rw-r--r--src/com/android/camera/ui/FilmStripView.java14
2 files changed, 0 insertions, 17 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index df2195844..3d03988a2 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1111,9 +1111,6 @@ public class CameraActivity extends Activity
mLocalImagesObserver.setActivityPaused(true);
mLocalVideosObserver.setActivityPaused(true);
- if (mFilmStripView.inCameraFullscreen()) {
- mFilmStripView.getController().clearSurfaceViews();
- }
}
@Override
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 9945952ee..b049ddbf0 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -409,7 +409,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
public void goToFullScreen();
- public void clearSurfaceViews();
}
/**
@@ -2334,19 +2333,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()) {