Merge "Add interface for swipe checking." into gb-ub-photos-carlsbad

3 files changed, 22 insertions, 0 deletions

diff --git a/src/com/android/camera/NewCameraActivity.java b/src/com/android/camera/NewCameraActivity.java
index 3313edea3..b549ad270 100644
--- a/src/com/android/camera/NewCameraActivity.java
+++ b/src/com/android/camera/NewCameraActivity.java
@@ -190,6 +190,9 @@ public class NewCameraActivity extends Activity
                 mDataAdapter.removeData(dataID);
             }
 
+            @Override
+            public void onDataFullScreenChange(int dataID, boolean full) {
+            }
         });
         mCurrentModule = new NewPhotoModule();
         mCurrentModule.init(this, mRootView);
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 32b3afecc..340189990 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -58,6 +58,8 @@ public class CameraDataAdapter implements FilmStripView.DataAdapter {
     private int mSuggestedWidth = DEFAULT_DECODE_SIZE;
     private int mSuggestedHeight = DEFAULT_DECODE_SIZE;
 
+    private boolean mCameraPreviewLocked;
+
     public CameraDataAdapter(Drawable placeHolder) {
         mPlaceHolder = placeHolder;
     }
@@ -72,6 +74,10 @@ public class CameraDataAdapter implements FilmStripView.DataAdapter {
         qtask.execute(resolver);
     }
 
+    public void setCameraPreviewLock(boolean locked) {
+        mCameraPreviewLocked = locked;
+    }
+
     @Override
     public int getTotalNumber() {
         if (mImages == null) {
@@ -120,6 +126,15 @@ public class CameraDataAdapter implements FilmStripView.DataAdapter {
         }
     }
 
+    @Override
+    public boolean canSwipeInFullScreen(int id) {
+        if (mImages.get(id).getType()
+                == ImageData.TYPE_CAMERA_PREVIEW) {
+            return mCameraPreviewLocked;
+        }
+        return false;
+    }
+
     public void removeData(int dataID) {
         if (dataID >= mImages.size()) return;
         LocalData d = mImages.remove(dataID);
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 4d1d6e05d..8411ba473 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -129,11 +129,15 @@ public class FilmStripView extends ViewGroup {
         public void suggestDecodeSize(int w, int h);
 
         public void setListener(Listener listener);
+
+        // true if the view of the data can be moved when in fullscreen.
+        public boolean canSwipeInFullScreen(int id);
     }
 
     public interface Listener {
         public void onDataPromoted(int dataID);
         public void onDataDemoted(int dataID);
+        public void onDataFullScreenChange(int dataID, boolean full);
     }
 
     public interface Controller {