Merge commit '770c2b3e' into stuff1

Conflicts:
	src/com/android/camera/data/LocalSessionData.java

Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd

diff --cc src/com/android/camera/data/LocalMediaData.java
index d5a6885,ab57058..950695f
--- 1/src/com/android/camera/data/LocalMediaData.java
--- 2/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@@ -32,11 -31,10 +31,10 @@@ import android.widget.ImageView
  
  import com.android.camera.Storage;
  import com.android.camera.debug.Log;
- import com.android.camera.util.CameraUtil;
  import com.android.camera2.R;
 -import com.bumptech.glide.BitmapRequestBuilder;
 +import com.bumptech.glide.DrawableRequestBuilder;
  import com.bumptech.glide.Glide;
 -import com.bumptech.glide.load.resource.bitmap.BitmapEncoder;
 +import com.bumptech.glide.load.engine.DiskCacheStrategy;
  
  import java.io.File;
  import java.text.DateFormat;

diff --cc src/com/android/camera/data/LocalSessionData.java
index 13a722d,8a5d6c6..ac02efb
--- 1/src/com/android/camera/data/LocalSessionData.java
--- 2/src/com/android/camera/data/LocalSessionData.java
+++ b/src/com/android/camera/data/LocalSessionData.java
@@@ -26,9 -26,6 +26,8 @@@ import android.widget.ImageView
  import com.android.camera.Storage;
  import com.android.camera2.R;
  import com.bumptech.glide.Glide;
- import com.bumptech.glide.load.DecodeFormat;
 +import com.bumptech.glide.load.engine.DiskCacheStrategy;
 +import com.bumptech.glide.signature.StringSignature;
  
  import java.util.Date;
  import java.util.concurrent.TimeUnit;

diff --cc src/com/android/camera/widget/FilmstripView.java
index a517922,8743c43..4760fb7
--- 1/src/com/android/camera/widget/FilmstripView.java
--- 2/src/com/android/camera/widget/FilmstripView.java
+++ b/src/com/android/camera/widget/FilmstripView.java
@@@ -86,9 -115,9 +116,10 @@@ public class FilmstripView extends View
      // Only check for intercepting touch events within first 500ms
      private static final int SWIPE_TIME_OUT = 500;
      private static final int DECELERATION_FACTOR = 4;
 +    private static final float MOUSE_SCROLL_FACTOR = 128f;
  
      private CameraActivity mActivity;
+     private ActionCallback mActionCallback;
      private FilmstripGestureRecognizer mGestureRecognizer;
      private FilmstripGestureRecognizer.Listener mGestureListener;
      private DataAdapter mDataAdapter;