summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-05-05 21:41:07 -0700
committerSteve Kondik <shade@chemlab.org>2013-05-05 21:41:07 -0700
commit82215dddc39308ba362d3b7b04414aa7f1bccba6 (patch)
treec1b3f44d7b0f6696279f0712f4ad1892887ae86b
parent6d943544b24613c41515de930c7ca86ad997b216 (diff)
downloadandroid_packages_apps_Gallery2-82215dddc39308ba362d3b7b04414aa7f1bccba6.tar.gz
android_packages_apps_Gallery2-82215dddc39308ba362d3b7b04414aa7f1bccba6.tar.bz2
android_packages_apps_Gallery2-82215dddc39308ba362d3b7b04414aa7f1bccba6.zip
Revert "Revert "Add storage selection (2/2)""cm-10.1.0-RC2cm-10.1.0-RC1
This reverts commit 27f80c30596362e2f9a3e2045068fdd6c2f9a168.
-rw-r--r--src/com/android/gallery3d/app/StateManager.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/StateManager.java b/src/com/android/gallery3d/app/StateManager.java
index d77279f78..fa7d857ba 100644
--- a/src/com/android/gallery3d/app/StateManager.java
+++ b/src/com/android/gallery3d/app/StateManager.java
@@ -69,6 +69,26 @@ public class StateManager {
if (mIsResumed) state.resume();
}
+ //Starts state without 'transitionOnNextPause'
+ public void startStateNow(Class<? extends ActivityState> klass, Bundle data) {
+ Log.v(TAG, "startStateNow " + klass);
+ ActivityState state = null;
+ try {
+ state = klass.newInstance();
+ } catch (Exception e) {
+ throw new AssertionError(e);
+ }
+ if (!mStack.isEmpty()) {
+ ActivityState top = getTopState();
+ if (mIsResumed) top.onPause();
+ }
+ state.initialize(mActivity, data);
+
+ mStack.push(new StateEntry(data, state));
+ state.onCreate(data, null);
+ if (mIsResumed) state.resume();
+ }
+
public void startStateForResult(Class<? extends ActivityState> klass,
int requestCode, Bundle data) {
Log.v(TAG, "startStateForResult " + klass + ", " + requestCode);