Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/app/GalleryAppImpl.java b/src/com/android/gallery3d/app/GalleryAppImpl.java
index 9576093a4..c4507b340 100644
--- a/src/com/android/gallery3d/app/GalleryAppImpl.java
+++ b/src/com/android/gallery3d/app/GalleryAppImpl.java
@@ -30,6 +30,7 @@ import com.android.gallery3d.gadget.WidgetUtils;
 import com.android.gallery3d.photoeditor.PhotoEditor;
 import com.android.gallery3d.picasasource.PicasaSource;
 import com.android.gallery3d.util.GalleryUtils;
+import com.android.gallery3d.util.LightCycleHelper;
 import com.android.gallery3d.util.ThreadPool;
 
 import java.io.File;
@@ -44,6 +45,7 @@ public class GalleryAppImpl extends Application implements GalleryApp {
     private DataManager mDataManager;
     private ThreadPool mThreadPool;
     private DownloadCache mDownloadCache;
+    private StitchingProgressManager mStitchingProgressManager;
 
     @Override
     public void onCreate() {
@@ -59,6 +61,8 @@ public class GalleryAppImpl extends Application implements GalleryApp {
         getPackageManager().setComponentEnabledSetting(
                 new ComponentName(this, PhotoEditor.class),
                 state, PackageManager.DONT_KILL_APP);
+
+        mStitchingProgressManager = LightCycleHelper.createStitchingManagerInstance(this);
     }
 
     @Override
@@ -76,6 +80,11 @@ public class GalleryAppImpl extends Application implements GalleryApp {
     }
 
     @Override
+    public StitchingProgressManager getStitchingProgressManager() {
+        return mStitchingProgressManager;
+    }
+
+    @Override
     public ImageCacheService getImageCacheService() {
         // This method may block on file I/O so a dedicated lock is needed here.
         synchronized (mLock) {