summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-10-08 22:23:07 +0200
committerJorge Ruesga <jorge@ruesga.com>2013-10-08 22:23:07 +0200
commit5fd8f4e777db294bdb9c5c35834e87a17b71d08f (patch)
treeca37f0f9d8e7acb871129c89ab15b63e61b3b4aa
parent1249a9d6a2b9bf5049c6eb8bdf62563e4e533048 (diff)
downloadandroid_packages_apps_Gallery2-5fd8f4e777db294bdb9c5c35834e87a17b71d08f.tar.gz
android_packages_apps_Gallery2-5fd8f4e777db294bdb9c5c35834e87a17b71d08f.tar.bz2
android_packages_apps_Gallery2-5fd8f4e777db294bdb9c5c35834e87a17b71d08f.zip
Gallery: Fix filmstrip with no camera tile
Change-Id: I85f1a6ee2c9587a2071234a1754e03886c351f09 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/android/gallery3d/app/FilmstripPage.java7
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;
}
}