diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-08 13:29:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-08 13:29:39 -0800 |
| commit | 5e16a5b68456e974ebb02ff15eddfd7f56e92962 (patch) | |
| tree | 80924b5d75f7e36b5e975976b5824ad65417b896 /src | |
| parent | 48276bba29ecbf66b474789d857f08b413864ca0 (diff) | |
| parent | 24f020e646ecec580cdb824d8fdbdec7b2cea32a (diff) | |
| download | android_packages_apps_Snap-5e16a5b68456e974ebb02ff15eddfd7f56e92962.tar.gz android_packages_apps_Snap-5e16a5b68456e974ebb02ff15eddfd7f56e92962.tar.bz2 android_packages_apps_Snap-5e16a5b68456e974ebb02ff15eddfd7f56e92962.zip | |
Merge "Camera: Revering changes of clear preview frame during activity pause."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 14 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 3351eb142..7c8e911d0 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1225,9 +1225,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 89da0184e..d0bcdfcc2 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -410,7 +410,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { public void goToFullScreen(); - public void clearSurfaceViews(); } /** @@ -2356,19 +2355,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()) { |