summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2012-09-25 13:58:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-25 13:58:36 -0700
commitdc4107678f6ae7ff017c662e94a7cf628940a47e (patch)
tree8a3772530004ff29c1abe2973f54b97e6809aa39
parentfcee3ef453be5f1cc2bd88f1e0b3e7f85129ee7a (diff)
parent94a7444cd0397e830a31cf3b754967bb7e64fcd7 (diff)
downloadandroid_packages_apps_Snap-dc4107678f6ae7ff017c662e94a7cf628940a47e.tar.gz
android_packages_apps_Snap-dc4107678f6ae7ff017c662e94a7cf628940a47e.tar.bz2
android_packages_apps_Snap-dc4107678f6ae7ff017c662e94a7cf628940a47e.zip
Merge "Making switchState public" into gb-ub-photos-arches
-rw-r--r--src/com/android/gallery3d/app/StateManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index 7cc0ac42c..c192a88a3 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -193,7 +193,7 @@ public class StateManager {
}
}
- void switchState(ActivityState oldState,
+ public void switchState(ActivityState oldState,
Class<? extends ActivityState> klass, Bundle data) {
Log.v(TAG, "switchState " + oldState + ", " + klass);
if (oldState != mStack.peek().activityState) {