diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2013-10-09 19:49:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-10-09 19:49:56 +0000 |
| commit | e4af10e9ac94fea19d6e6de7c13c7868cebe99ad (patch) | |
| tree | 1dc82286f381f9b2003a4289f6602579e4867dd5 | |
| parent | e1c54cab5aa5d968cdc69f0294bea00c85259384 (diff) | |
| parent | 5fd8f4e777db294bdb9c5c35834e87a17b71d08f (diff) | |
| download | android_packages_apps_Gallery2-e4af10e9ac94fea19d6e6de7c13c7868cebe99ad.tar.gz android_packages_apps_Gallery2-e4af10e9ac94fea19d6e6de7c13c7868cebe99ad.tar.bz2 android_packages_apps_Gallery2-e4af10e9ac94fea19d6e6de7c13c7868cebe99ad.zip | |
Merge "Gallery: Fix filmstrip with no camera tile" into cm-10.2
| -rw-r--r-- | src/com/android/gallery3d/app/FilmstripPage.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/app/FilmstripPage.java b/src/com/android/gallery3d/app/FilmstripPage.java index cc95c04d7..0b6dcc6fe 100644 --- a/src/com/android/gallery3d/app/FilmstripPage.java +++ b/src/com/android/gallery3d/app/FilmstripPage.java @@ -16,11 +16,14 @@ package com.android.gallery3d.app; +import android.os.Parcelable; + public class FilmstripPage extends PhotoPage { @Override protected int getStartSourceIndex() { - // The camera itself - return 1; + // Detect when the camera tile is present + Parcelable parcelable = getData().getParcelable(KEY_APP_BRIDGE); + return parcelable != null && parcelable instanceof AppBridge ? 1 : 0; } } |