This adds the following four CLs to Camera2:

  http://ag/339319
  http://ag/338974
  http://ag/338401
  http://ag/324149

Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.

Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569

1 files changed, 33 insertions, 12 deletions

diff --git a/src/com/android/camera/data/FixedFirstDataAdapter.java b/src/com/android/camera/data/FixedFirstDataAdapter.java
index 34ba0a1a0..2bff22aa4 100644
--- a/src/com/android/camera/data/FixedFirstDataAdapter.java
+++ b/src/com/android/camera/data/FixedFirstDataAdapter.java
@@ -32,7 +32,7 @@ import com.android.camera.ui.FilmStripView.ImageData;
 public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
         implements DataAdapter.Listener {
 
-    private final LocalData mFirstData;
+    private LocalData mFirstData;
     private Listener mListener;
 
     /**
@@ -53,6 +53,14 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
     }
 
     @Override
+    public LocalData getLocalData(int dataID) {
+        if (dataID == 0) {
+            return mFirstData;
+        }
+        return mAdapter.getLocalData(dataID - 1);
+    }
+
+    @Override
     public void removeData(Context context, int dataID) {
         if (dataID > 0) {
             mAdapter.removeData(context, dataID - 1);
@@ -69,6 +77,28 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
     }
 
     @Override
+    public void updateData(int pos, LocalData data) {
+        if (pos == 0) {
+            mFirstData = data;
+            if (mListener != null) {
+                mListener.onDataUpdated(new UpdateReporter() {
+                    @Override
+                    public boolean isDataRemoved(int dataID) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean isDataUpdated(int dataID) {
+                        return (dataID == 0);
+                    }
+                });
+            }
+        } else {
+            mAdapter.updateData(pos - 1, data);
+        }
+    }
+
+    @Override
     public int getTotalNumber() {
         return (mAdapter.getTotalNumber() + 1);
     }
@@ -100,15 +130,6 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
     }
 
     @Override
-    public void onDataCentered(int dataID, boolean centered) {
-        if (dataID != 0) {
-            mAdapter.onDataCentered(dataID, centered);
-        } else {
-            // TODO: notify the data
-        }
-    }
-
-    @Override
     public void setListener(Listener listener) {
         mListener = listener;
         mAdapter.setListener((listener == null) ? null : this);
@@ -132,12 +153,12 @@ public class FixedFirstDataAdapter extends AbstractLocalDataAdapterWrapper
         mListener.onDataUpdated(new UpdateReporter() {
             @Override
             public boolean isDataRemoved(int dataID) {
-                return reporter.isDataRemoved(dataID + 1);
+                return reporter.isDataRemoved(dataID - 1);
             }
 
             @Override
             public boolean isDataUpdated(int dataID) {
-                return reporter.isDataUpdated(dataID + 1);
+                return reporter.isDataUpdated(dataID - 1);
             }
         });
     }