story mode for PhotoTable.

also some cleanup and refactoring
also fix stuck alphas

Bug: 8399588
Change-Id: Id236b29701ede3696c8f1f0ccc6522eb8256ff25

1 files changed, 10 insertions, 5 deletions

diff --git a/src/com/android/dreams/phototable/PhotoSourcePlexor.java b/src/com/android/dreams/phototable/PhotoSourcePlexor.java
index 147f16e..93fdc9e 100644
--- a/src/com/android/dreams/phototable/PhotoSourcePlexor.java
+++ b/src/com/android/dreams/phototable/PhotoSourcePlexor.java
@@ -17,12 +17,8 @@ package com.android.dreams.phototable;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.net.Uri;
 
-import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.LinkedList;
 
@@ -34,7 +30,6 @@ public class PhotoSourcePlexor extends PhotoSource {
 
     private final PhotoSource mPicasaSource;
     private final PhotoSource mLocalSource;
-    private SharedPreferences mSettings;
 
     public PhotoSourcePlexor(Context context, SharedPreferences settings) {
         super(context, settings);
@@ -75,4 +70,14 @@ public class PhotoSourcePlexor extends PhotoSource {
     protected InputStream getStream(ImageData data, int longSide) {
         return data.getStream(longSide);
     }
+
+    @Override
+    protected ImageData naturalNext(ImageData current) {
+        return current.naturalNext();
+    }
+
+    @Override
+    protected ImageData naturalPrevious(ImageData current) {
+        return current.naturalPrevious();
+    }
 }