commit 8e97065f7cfb2ff7c6b3bde13bf19c23b0358ee4
author Paul Westbrook <pwestbro@google.com> Fri Feb 15 10:47:37 2013 -0800
committer Paul Westbrook <pwestbro@google.com> Fri Feb 15 10:47:37 2013 -0800
tree f5de14de7a090652cc734f394cf76d5c6bd4bb8e
parent f766f358fa68de426e013df10930701682ae356c
parent 2de1aa6bc9a936ff3f2f654db770a091904533d7

Merge branch 'goog/jb-ub-mail-ur8' into master

Change-Id: Ie28475b31bb0d5d214c948c498d88e540d6f93a9

src/com/android/ex/photo/Intents.java

diff --git a/src/com/android/ex/photo/Intents.java b/src/com/android/ex/photo/Intents.java
index 4425a32..35bf33f 100644
--- a/src/com/android/ex/photo/Intents.java
+++ b/src/com/android/ex/photo/Intents.java
@@ -17,6 +17,7 @@
 
 package com.android.ex.photo;
 
+import android.app.Activity;
 import android.content.ContentProvider;
 import android.content.Context;
 import android.content.Intent;
@@ -58,7 +59,7 @@
 
     /** Gets a new photo view intent builder */
     public static PhotoViewIntentBuilder newPhotoViewIntentBuilder(
-            Context context, Class<? extends PhotoViewActivity> cls) {
+            Context context, Class<? extends Activity> cls) {
         return new PhotoViewIntentBuilder(context, cls);
     }
 

src/com/android/ex/photo/PhotoViewActivity.java

diff --git a/src/com/android/ex/photo/PhotoViewActivity.java b/src/com/android/ex/photo/PhotoViewActivity.java
index fad1b31..a772424 100644
--- a/src/com/android/ex/photo/PhotoViewActivity.java
+++ b/src/com/android/ex/photo/PhotoViewActivity.java
@@ -408,7 +408,7 @@
     }
 
     @Override
-    public void onFragmentVisible(PhotoViewFragment fragment) {
+    public void onFragmentVisible(Fragment fragment) {
         updateActionBar();
     }
 

src/com/android/ex/photo/PhotoViewCallbacks.java

diff --git a/src/com/android/ex/photo/PhotoViewCallbacks.java b/src/com/android/ex/photo/PhotoViewCallbacks.java
index 6cb8a77..d71c710 100644
--- a/src/com/android/ex/photo/PhotoViewCallbacks.java
+++ b/src/com/android/ex/photo/PhotoViewCallbacks.java
@@ -67,7 +67,7 @@
 
     public boolean isFragmentActive(Fragment fragment);
 
-    public void onFragmentVisible(PhotoViewFragment fragment);
+    public void onFragmentVisible(Fragment fragment);
 
     public boolean isFragmentFullScreen(Fragment fragment);