Merge "Update CL http://ag/387747" into gb-ub-photos-denali

5 files changed, 15 insertions, 16 deletions

diff --git a/src/com/android/camera/data/InProgressDataWrapper.java b/src/com/android/camera/data/InProgressDataWrapper.java
index ebefb3890..30314e22e 100644
--- a/src/com/android/camera/data/InProgressDataWrapper.java
+++ b/src/com/android/camera/data/InProgressDataWrapper.java
@@ -50,16 +50,16 @@ public class InProgressDataWrapper implements LocalData {
 
     @Override
     public View getView(
-            Context ctx, int width, int height,
+            Context contex, int width, int height,
             Drawable placeHolder, LocalDataAdapter adapter) {
-        View v =  mLocalData.getView(ctx, width, height, placeHolder, adapter);
+        View v =  mLocalData.getView(contex, width, height, placeHolder, adapter);
 
         if (mHasProgressBar) {
             // Return a framelayout with the progressbar and imageview.
-            FrameLayout frame = new FrameLayout(ctx);
+            FrameLayout frame = new FrameLayout(contex);
             frame.setLayoutParams(new FrameLayout.LayoutParams(width, height));
             frame.addView(v);
-            ((LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE))
+            ((LayoutInflater) contex.getSystemService(Context.LAYOUT_INFLATER_SERVICE))
                     .inflate(R.layout.placeholder_progressbar, frame);
             return frame;
         }
diff --git a/src/com/android/camera/filmstrip/FilmstripDataAdapter.java b/src/com/android/camera/filmstrip/FilmstripDataAdapter.java
index ac4aa1fb4..0018de637 100644
--- a/src/com/android/camera/filmstrip/FilmstripDataAdapter.java
+++ b/src/com/android/camera/filmstrip/FilmstripDataAdapter.java
@@ -50,14 +50,14 @@ public interface FilmstripDataAdapter {
         public void onDataLoaded();
 
         /**
-         * Called some of the data are updated.
+         * Called when some of the data is updated.
          *
          * @param reporter Use this reporter to know what happened.
          */
         public void onDataUpdated(UpdateReporter reporter);
 
         /**
-         * Called when a new data is inserted.
+         * Called when a new data item is inserted.
          *
          * @param dataID The ID of the inserted data.
          * @param data The inserted data.
@@ -65,7 +65,7 @@ public interface FilmstripDataAdapter {
         public void onDataInserted(int dataID, FilmstripImageData data);
 
         /**
-         * Called when a data is removed.
+         * Called when a data item is removed.
          *
          * @param dataID The ID of the removed data.
          * @param data The data.
diff --git a/src/com/android/camera/filmstrip/FilmstripImageData.java b/src/com/android/camera/filmstrip/FilmstripImageData.java
index f505a3c97..c6aa179b9 100644
--- a/src/com/android/camera/filmstrip/FilmstripImageData.java
+++ b/src/com/android/camera/filmstrip/FilmstripImageData.java
@@ -68,7 +68,7 @@ public interface FilmstripImageData {
     public static final int SIZE_FULL = -2;
 
     /**
-     * Returns the width in pixel of the image before orientation applied.
+     * Returns the width in pixels of the image before orientation applied.
      * The final layout of the view returned by
      * {@link FilmstripDataAdapter#getView(Context, int)} will
      * preserve the aspect ratio of
@@ -78,7 +78,7 @@ public interface FilmstripImageData {
     public int getWidth();
 
     /**
-     * Returns the height in pixel of the image before orientation applied.
+     * Returns the height in pixels of the image before orientation applied.
      * The final layout of the view returned by
      * {@link FilmstripDataAdapter#getView(Context, int)} will
      * preserve the aspect ratio of
@@ -94,8 +94,7 @@ public interface FilmstripImageData {
     public int getOrientation();
 
     /** Returns the image data type. The current valid values are
-     * {@code VIEW_TYPE_NONE}, {@code VIEW_TYPE_STICKY}, and
-     * {@code VIEW_TYPE_REMOVABLE}.
+     * {@code VIEW_TYPE_*}.
      */
     public int getViewType();
 
diff --git a/src/com/android/camera/filmstrip/FilmstripListener.java b/src/com/android/camera/filmstrip/FilmstripListener.java
index b06318f7d..e4986b90f 100644
--- a/src/com/android/camera/filmstrip/FilmstripListener.java
+++ b/src/com/android/camera/filmstrip/FilmstripListener.java
@@ -21,7 +21,7 @@ package com.android.camera.filmstrip;
  */
 public interface FilmstripListener {
     /**
-     * Callback when the data is promoted. A data is promoted if the user swipe
+     * Callback when the data item is promoted. A data is promoted if the user swipe
      * up a data vertically.
      *
      * @param dataID The ID of the promoted data.
@@ -29,7 +29,7 @@ public interface FilmstripListener {
     public void onDataPromoted(int dataID);
 
     /**
-     * Callback when the data is demoted. A data is promoted if the user swipe
+     * Callback when the data item is demoted. A data is promoted if the user swipe
      * down a data vertically.
      *
      * @param dataID The ID of the demoted data.
@@ -52,14 +52,14 @@ public interface FilmstripListener {
     public void onDataReloaded();
 
     /**
-     * Called when the data is centered in the film strip.
+     * Called when the data item is centered in the film strip.
      *
      * @param dataID the ID of the local data
      */
     public void onCurrentDataCentered(int dataID);
 
     /**
-     * Called when the data is off centered in the film strip.
+     * Called when the data item is off centered in the film strip.
      *
      * @param dataID the ID of the local data
      */
diff --git a/src/com/android/camera/ui/FilmstripView.java b/src/com/android/camera/ui/FilmstripView.java
index 22ddbb173..29979aee6 100644
--- a/src/com/android/camera/ui/FilmstripView.java
+++ b/src/com/android/camera/ui/FilmstripView.java
@@ -741,7 +741,7 @@ public class FilmstripView extends ViewGroup implements BottomControlsListener {
     }
 
     /**
-     * Returns the ID of the current, or -1.
+     * Returns the ID of the current item, or -1 if there is no data.
      */
     private int getCurrentId() {
         ViewItem current = mViewItem[mCurrentItem];