diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-13 02:40:37 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-13 02:40:37 -0800 |
commit | 12cf0d082018c504db4839b8b162e1d17960c3ff (patch) | |
tree | 1daf4727936ea174e48c4dd4616dd8ae1aa9165b /src | |
parent | 7c08126209fd5581e6fa00769635fdcbe2c3e87c (diff) | |
parent | 7290784ab3832a99983149e929dd5f7449656d3c (diff) | |
download | android_packages_apps_Gallery2-12cf0d082018c504db4839b8b162e1d17960c3ff.tar.gz android_packages_apps_Gallery2-12cf0d082018c504db4839b8b162e1d17960c3ff.tar.bz2 android_packages_apps_Gallery2-12cf0d082018c504db4839b8b162e1d17960c3ff.zip |
Merge "Galler2 : Load onResume on separate thread"
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/AbstractGalleryActivity.java | 36 | ||||
-rw-r--r-- | src/com/android/gallery3d/app/MovieActivity.java | 11 |
2 files changed, 37 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/app/AbstractGalleryActivity.java b/src/com/android/gallery3d/app/AbstractGalleryActivity.java index ae30cb0aa..84a9b5753 100644 --- a/src/com/android/gallery3d/app/AbstractGalleryActivity.java +++ b/src/com/android/gallery3d/app/AbstractGalleryActivity.java @@ -37,6 +37,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.Window; import android.view.WindowManager; +import android.os.Handler; import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; @@ -60,6 +61,7 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext private TransitionStore mTransitionStore = new TransitionStore(); private boolean mDisableToggleStatusBar; private PanoramaViewHelper mPanoramaViewHelper; + private static final int ONRESUME_DELAY = 50; private AlertDialog mAlertDialog = null; private BroadcastReceiver mMountReceiver = new BroadcastReceiver() { @@ -212,15 +214,31 @@ public class AbstractGalleryActivity extends Activity implements GalleryContext @Override protected void onResume() { super.onResume(); - mGLRootView.lockRenderThread(); - try { - getStateManager().resume(); - getDataManager().resume(); - } finally { - mGLRootView.unlockRenderThread(); - } - mGLRootView.onResume(); - mOrientationManager.resume(); + delayedOnResume(ONRESUME_DELAY); + } + + private void delayedOnResume(final int delay){ + final Handler handler = new Handler(); + Runnable delayTask = new Runnable() { + @Override + public void run() { + handler.postDelayed(new Runnable() { + @Override + public void run() { + mGLRootView.lockRenderThread(); + try { + getStateManager().resume(); + getDataManager().resume(); + } finally { + mGLRootView.unlockRenderThread(); + } + mGLRootView.onResume(); + mOrientationManager.resume(); + }}, delay); + } + }; + Thread delayThread = new Thread(delayTask); + delayThread.start(); } @Override diff --git a/src/com/android/gallery3d/app/MovieActivity.java b/src/com/android/gallery3d/app/MovieActivity.java index 6aa4ce46b..31370cbee 100644 --- a/src/com/android/gallery3d/app/MovieActivity.java +++ b/src/com/android/gallery3d/app/MovieActivity.java @@ -197,7 +197,7 @@ public class MovieActivity extends Activity { @Override public void onCompletion() { if (mFinishOnCompletion) { - finish(); + finishActivity(); mControlResumed = false; Bookmarker mBookmarker = new Bookmarker(MovieActivity.this); mBookmarker.setBookmark(mMovieItem.getUri(), 0, 1); @@ -801,4 +801,13 @@ public class MovieActivity extends Activity { actionBar.setTitle(title); } } + @Override + public void onBackPressed() { + finishActivity(); + } + private void finishActivity(){ + MovieActivity.this.finish(); + overridePendingTransition(0,0); + return; + } } |