summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/AbstractGalleryActivity.java
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2012-10-15 18:28:42 -0700
committerSascha Haeberling <haeberling@google.com>2012-10-17 11:22:03 -0700
commite3b50f1bfcfa5c8729f31788eac1a6109a88988b (patch)
tree5c1a337a023de93b78b647493953f82d7351ab0e /src/com/android/gallery3d/app/AbstractGalleryActivity.java
parent3038d014b7ade998d1820c997242b9d9d8bc7ccf (diff)
downloadandroid_packages_apps_Gallery2-e3b50f1bfcfa5c8729f31788eac1a6109a88988b.tar.gz
android_packages_apps_Gallery2-e3b50f1bfcfa5c8729f31788eac1a6109a88988b.tar.bz2
android_packages_apps_Gallery2-e3b50f1bfcfa5c8729f31788eac1a6109a88988b.zip
Adds GMS Core PanoramaClient to Gallery
Bug: 7319099 Also updates the API call to LightCycleHelper. This depends on http://go/ag/#/c/239523/ Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
Diffstat (limited to 'src/com/android/gallery3d/app/AbstractGalleryActivity.java')
-rw-r--r--src/com/android/gallery3d/app/AbstractGalleryActivity.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
index cb3aa9d0a..76649cab4 100644
--- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java
+++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java
@@ -41,6 +41,7 @@ import com.android.gallery3d.data.MediaItem;
import com.android.gallery3d.ui.GLRoot;
import com.android.gallery3d.ui.GLRootView;
import com.android.gallery3d.util.ThreadPool;
+import com.android.gallery3d.util.LightCycleHelper.PanoramaViewHelper;
public class AbstractGalleryActivity extends Activity implements GalleryContext {
@SuppressWarnings("unused")
@@ -51,6 +52,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
private OrientationManager mOrientationManager;
private TransitionStore mTransitionStore = new TransitionStore();
private boolean mDisableToggleStatusBar;
+ private PanoramaViewHelper mPanoramaViewHelper;
private AlertDialog mAlertDialog = null;
private BroadcastReceiver mMountReceiver = new BroadcastReceiver() {
@@ -67,6 +69,8 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
mOrientationManager = new OrientationManager(this);
toggleStatusBarByOrientation();
getWindow().setBackgroundDrawable(null);
+ mPanoramaViewHelper = new PanoramaViewHelper(this);
+ mPanoramaViewHelper.onCreate();
}
@Override
@@ -168,6 +172,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
mAlertDialog = builder.show();
registerReceiver(mMountReceiver, mMountFilter);
}
+ mPanoramaViewHelper.onStart();
}
@TargetApi(ApiHelper.VERSION_CODES.HONEYCOMB)
@@ -184,6 +189,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
mAlertDialog.dismiss();
mAlertDialog = null;
}
+ mPanoramaViewHelper.onStop();
}
@Override
@@ -293,4 +299,8 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext
public TransitionStore getTransitionStore() {
return mTransitionStore;
}
+
+ public PanoramaViewHelper getPanoramaViewHelper() {
+ return mPanoramaViewHelper;
+ }
}