Remove unused code.

Change-Id: I167596ab023671651df298ddb2b80b7c782f4223

12 files changed, 0 insertions, 116 deletions

diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index ac9774af1..f3e60cee9 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -44,7 +44,6 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity
     private static final String TAG = "AbstractGalleryActivity";
     private GLRootView mGLRootView;
     private StateManager mStateManager;
-    private PositionRepository mPositionRepository = new PositionRepository();
 
     private AlertDialog mAlertDialog = null;
     private BroadcastReceiver mMountReceiver = new BroadcastReceiver() {
@@ -84,10 +83,6 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity
         return this;
     }
 
-    public ImageCacheService getImageCacheService() {
-        return ((GalleryApp) getApplication()).getImageCacheService();
-    }
-
     public DataManager getDataManager() {
         return ((GalleryApp) getApplication()).getDataManager();
     }
@@ -96,10 +91,6 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity
         return ((GalleryApp) getApplication()).getThreadPool();
     }
 
-    public GalleryApp getGalleryApplication() {
-        return (GalleryApp) getApplication();
-    }
-
     public synchronized StateManager getStateManager() {
         if (mStateManager == null) {
             mStateManager = new StateManager(this);
@@ -111,21 +102,12 @@ public class AbstractGalleryActivity extends Activity implements GalleryActivity
         return mGLRootView;
     }
 
-    public PositionRepository getPositionRepository() {
-        return mPositionRepository;
-    }
-
     @Override
     public void setContentView(int resId) {
         super.setContentView(resId);
         mGLRootView = (GLRootView) findViewById(R.id.gl_root_view);
     }
 
-    public int getActionBarHeight() {
-        ActionBar actionBar = getActionBar();
-        return actionBar != null ? actionBar.getHeight() : 0;
-    }
-
     protected void onStorageReady() {
         if (mAlertDialog != null) {
             mAlertDialog.dismiss();
diff --git a/src/com/android/gallery3d/app/ActivityState.java b/src/com/android/gallery3d/app/ActivityState.java
index 48ee9fecc..e49c502f2 100644
--- a/src/com/android/gallery3d/app/ActivityState.java
+++ b/src/com/android/gallery3d/app/ActivityState.java
@@ -56,7 +56,6 @@ abstract public class ActivityState {
         public int requestCode;
         public int resultCode = Activity.RESULT_CANCELED;
         public Intent resultData;
-        ResultEntry next;
     }
 
     private boolean mDestroyed = false;
diff --git a/src/com/android/gallery3d/app/AlbumDataAdapter.java b/src/com/android/gallery3d/app/AlbumDataAdapter.java
index 6711786e5..1d10b89f4 100644
--- a/src/com/android/gallery3d/app/AlbumDataAdapter.java
+++ b/src/com/android/gallery3d/app/AlbumDataAdapter.java
@@ -119,10 +119,6 @@ public class AlbumDataAdapter implements AlbumView.Model {
         return mActiveStart;
     }
 
-    public int getActiveEnd() {
-        return mActiveEnd;
-    }
-
     public boolean isActive(int index) {
         return index >= mActiveStart && index < mActiveEnd;
     }
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 99d86f525..ead2a2005 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -249,20 +249,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
                 AlbumSetPage.class, REQUEST_DO_ANIMATION, data);
     }
 
-    public void doFilter(int filterType) {
-        String basePath = mMediaSet.getPath().toString();
-        String newPath = FilterUtils.switchFilterPath(basePath, filterType);
-        Bundle data = new Bundle(getData());
-        data.putString(AlbumPage.KEY_MEDIA_PATH, newPath);
-        mAlbumView.savePositions(PositionRepository.getInstance(mActivity));
-        mActivity.getStateManager().switchState(this, AlbumPage.class, data);
-    }
-
-    public void onOperationComplete() {
-        mAlbumView.invalidate();
-        // TODO: enable animation
-    }
-
     @Override
     protected void onCreate(Bundle data, Bundle restoreState) {
         mUserDistance = GalleryUtils.meterToPixel(USER_DISTANCE_METER);
diff --git a/src/com/android/gallery3d/app/AlbumSetDataAdapter.java b/src/com/android/gallery3d/app/AlbumSetDataAdapter.java
index 5318a61bc..262778aa8 100644
--- a/src/com/android/gallery3d/app/AlbumSetDataAdapter.java
+++ b/src/com/android/gallery3d/app/AlbumSetDataAdapter.java
@@ -133,10 +133,6 @@ public class AlbumSetDataAdapter implements AlbumSetView.Model {
         return mActiveStart;
     }
 
-    public int getActiveEnd() {
-        return mActiveEnd;
-    }
-
     public boolean isActive(int index) {
         return index >= mActiveStart && index < mActiveEnd;
     }
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 118b7d5aa..080d1ae6f 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -258,20 +258,6 @@ public class AlbumSetPage extends ActivityState implements
         mActivity.getStateManager().switchState(this, AlbumSetPage.class, data);
     }
 
-    public void doFilter(int filterType) {
-        String basePath = mMediaSet.getPath().toString();
-        String newPath = FilterUtils.switchFilterPath(basePath, filterType);
-        Bundle data = new Bundle(getData());
-        data.putString(AlbumSetPage.KEY_MEDIA_PATH, newPath);
-        mAlbumSetView.savePositions(PositionRepository.getInstance(mActivity));
-        mActivity.getStateManager().switchState(this, AlbumSetPage.class, data);
-    }
-
-    public void onOperationComplete() {
-        mAlbumSetView.invalidate();
-        // TODO: enable animation
-    }
-
     @Override
     public void onCreate(Bundle data, Bundle restoreState) {
         initializeViews();
diff --git a/src/com/android/gallery3d/app/ControllerOverlay.java b/src/com/android/gallery3d/app/ControllerOverlay.java
index 847d9e60c..03472134d 100644
--- a/src/com/android/gallery3d/app/ControllerOverlay.java
+++ b/src/com/android/gallery3d/app/ControllerOverlay.java
@@ -51,10 +51,5 @@ public interface ControllerOverlay {
 
   void showErrorMessage(String message);
 
-  void hide();
-
   void setTimes(int currentTime, int totalTime);
-
-  void resetTime();
-
 }
diff --git a/src/com/android/gallery3d/app/FilterUtils.java b/src/com/android/gallery3d/app/FilterUtils.java
index 9b8ea2d62..c15457e7e 100644
--- a/src/com/android/gallery3d/app/FilterUtils.java
+++ b/src/com/android/gallery3d/app/FilterUtils.java
@@ -214,11 +214,6 @@ public class FilterUtils {
         return "/cluster/{" + base + "}/" + kind;
     }
 
-    // Change the topmost filter to the specified type.
-    public static String switchFilterPath(String base, int filterType) {
-        return newFilterPath(removeOneFilterFromPath(base), filterType);
-    }
-
     // Change the topmost clustering to the specified type.
     public static String switchClusterPath(String base, int clusterType) {
         return newClusterPath(removeOneClusterFromPath(base), clusterType);
@@ -258,39 +253,4 @@ public class FilterUtils {
         }
         return sb.toString();
     }
-
-    // Remove the topmost filter (if any) from the path.
-    private static String removeOneFilterFromPath(String base) {
-        boolean[] done = new boolean[1];
-        return removeOneFilterFromPath(base, done);
-    }
-
-    private static String removeOneFilterFromPath(String base, boolean[] done) {
-        if (done[0]) return base;
-
-        String[] segments = Path.split(base);
-        if (segments[0].equals("filter") && segments[1].equals("mediatype")) {
-            done[0] = true;
-            return Path.splitSequence(segments[3])[0];
-        }
-
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < segments.length; i++) {
-            sb.append("/");
-            if (segments[i].startsWith("{")) {
-                sb.append("{");
-                String[] sets = Path.splitSequence(segments[i]);
-                for (int j = 0; j < sets.length; j++) {
-                    if (j > 0) {
-                        sb.append(",");
-                    }
-                    sb.append(removeOneFilterFromPath(sets[j], done));
-                }
-                sb.append("}");
-            } else {
-                sb.append(segments[i]);
-            }
-        }
-        return sb.toString();
-    }
 }
diff --git a/src/com/android/gallery3d/app/GalleryActionBar.java b/src/com/android/gallery3d/app/GalleryActionBar.java
index 717f16c6f..72b27c3f6 100644
--- a/src/com/android/gallery3d/app/GalleryActionBar.java
+++ b/src/com/android/gallery3d/app/GalleryActionBar.java
@@ -217,14 +217,6 @@ public class GalleryActionBar implements ActionBar.OnNavigationListener {
         if (mActionBar != null) mActionBar.setSubtitle(title);
     }
 
-    public void setNavigationMode(int mode) {
-        if (mActionBar != null) mActionBar.setNavigationMode(mode);
-    }
-
-    public int getHeight() {
-        return mActionBar == null ? 0 : mActionBar.getHeight();
-    }
-
     public boolean setSelectedAction(int type) {
         for (int i = 0, n = sClusterItems.length; i < n; i++) {
             ActionItem item = sClusterItems[i];
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index 02f2f72f3..a5e21eae0 100644
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -22,7 +22,5 @@ import com.android.gallery3d.ui.PositionRepository;
 public interface GalleryActivity extends GalleryContext {
     public StateManager getStateManager();
     public GLRoot getGLRoot();
-    public PositionRepository getPositionRepository();
-    public GalleryApp getGalleryApplication();
     public GalleryActionBar getGalleryActionBar();
 }
diff --git a/src/com/android/gallery3d/app/GalleryContext.java b/src/com/android/gallery3d/app/GalleryContext.java
index 022b4a704..7721b7d5e 100644
--- a/src/com/android/gallery3d/app/GalleryContext.java
+++ b/src/com/android/gallery3d/app/GalleryContext.java
@@ -26,13 +26,11 @@ import android.content.res.Resources;
 import android.os.Looper;
 
 public interface GalleryContext {
-    public ImageCacheService getImageCacheService();
     public DataManager getDataManager();
 
     public Context getAndroidContext();
 
     public Looper getMainLooper();
     public Resources getResources();
-    public ContentResolver getContentResolver();
     public ThreadPool getThreadPool();
 }
diff --git a/src/com/android/gallery3d/app/MovieControllerOverlay.java b/src/com/android/gallery3d/app/MovieControllerOverlay.java
index 752213e4b..9dde98037 100644
--- a/src/com/android/gallery3d/app/MovieControllerOverlay.java
+++ b/src/com/android/gallery3d/app/MovieControllerOverlay.java
@@ -176,10 +176,6 @@ public class MovieControllerOverlay extends FrameLayout implements
     showMainView(errorView);
   }
 
-  public void resetTime() {
-    timeBar.resetTime();
-  }
-
   public void setTimes(int currentTime, int totalTime) {
     timeBar.setTime(currentTime, totalTime);
   }