commit b5b12b0fe12e58caddcbfdd383749faeb83919dd
author Jorge Ruesga <jorge@ruesga.com> Tue Oct 08 22:23:07 2013 +0200
committer Whitehawkx <xxwhitehawk@gmail.com> Wed Oct 09 17:03:31 2013 -0700
tree 78e3128afa6008206082b823afea90cd805fc622
parent 17c7f57c5381be3e72ba090d7b74b3331a19c2f0

Gallery: Fix filmstrip with no camera tile

Change-Id: I85f1a6ee2c9587a2071234a1754e03886c351f09
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

src/com/android/gallery3d/app/FilmstripPage.java

diff --git a/src/com/android/gallery3d/app/FilmstripPage.java b/src/com/android/gallery3d/app/FilmstripPage.java
index cc95c04..0b6dcc6 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;
     }
 }