From fffc28dcab3ae031c41c5aa290861ab4c4303550 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 9 Oct 2012 21:02:42 -0700
Subject: Change how stitched images are inserted into Gallery.

 Bug 7299396
 Stitching images now use normal LocalImages for their MediaItem
 instead of LightCycleItems. They are no longer part of a special
 album.

Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
---
 .../gallery3d/app/StitchingProgressManager.java     | 21 +++++----------------
 .../android/gallery3d/util/LightCycleHelper.java    |  9 ---------
 2 files changed, 5 insertions(+), 25 deletions(-)

(limited to 'src_pd')

diff --git a/src_pd/com/android/gallery3d/app/StitchingProgressManager.java b/src_pd/com/android/gallery3d/app/StitchingProgressManager.java
index d0e2a6961..73868478e 100644
--- a/src_pd/com/android/gallery3d/app/StitchingProgressManager.java
+++ b/src_pd/com/android/gallery3d/app/StitchingProgressManager.java
@@ -16,30 +16,19 @@
 
 package com.android.gallery3d.app;
 
-import com.android.gallery3d.data.MediaItem;
-
-import java.util.ArrayList;
+import android.net.Uri;
 
 public class StitchingProgressManager {
-    public void addChangeListener(StitchingChangeListener l) {
-    }
-
-    public void removeChangeListener(StitchingChangeListener l) {
+    public StitchingProgressManager(GalleryApp app) {
     }
 
-    public int getItemCount() {
-        return 0;
+    public void addChangeListener(StitchingChangeListener l) {
     }
 
-    public MediaItem getItem(int i) {
-        return null;
+    public void removeChangeListener(StitchingChangeListener l) {
     }
 
-    public ArrayList<MediaItem> getAllItems() {
+    public Integer getProgress(Uri uri) {
         return null;
     }
-
-    public int getProgress(String filePath) {
-        return 100;
-    }
 }
diff --git a/src_pd/com/android/gallery3d/util/LightCycleHelper.java b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
index d455ff7c1..cc8ea20b9 100644
--- a/src_pd/com/android/gallery3d/util/LightCycleHelper.java
+++ b/src_pd/com/android/gallery3d/util/LightCycleHelper.java
@@ -25,7 +25,6 @@ import android.net.Uri;
 import com.android.camera.CameraModule;
 import com.android.gallery3d.app.GalleryApp;
 import com.android.gallery3d.app.StitchingProgressManager;
-import com.android.gallery3d.data.MediaSource;
 
 public class LightCycleHelper {
 
@@ -60,12 +59,4 @@ public class LightCycleHelper {
     public static StitchingProgressManager createStitchingManagerInstance(GalleryApp app) {
         return null;
     }
-
-    public static MediaSource createMediaSourceInstance(GalleryApp app) {
-        return null;
-    }
-
-    public static String wrapGalleryPath(String path) {
-        return path;
-    }
 }
-- 
cgit v1.2.3