--- a/packages/apps/Gallery2/src/com/android/gallery3d/app/AbstractGalleryActivity.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/AbstractGalleryActivity.java 2020-06-10 12:58:15.107286681 +0300 @@ -192,12 +192,12 @@ public class AbstractGalleryActivity ext @Override protected void onStop() { super.onStop(); - if (mAlertDialog != null) { +/* if (mAlertDialog != null) { unregisterReceiver(mMountReceiver); mAlertDialog.dismiss(); mAlertDialog = null; } - mPanoramaViewHelper.onStop(); + mPanoramaViewHelper.onStop();*/ } @Override @@ -217,7 +217,7 @@ public class AbstractGalleryActivity ext @Override protected void onPause() { super.onPause(); - mOrientationManager.pause(); +/* mOrientationManager.pause(); mGLRootView.onPause(); mGLRootView.lockRenderThread(); try { @@ -227,7 +227,7 @@ public class AbstractGalleryActivity ext mGLRootView.unlockRenderThread(); } GalleryBitmapPool.getInstance().clear(); - MediaItem.getBytesBufferPool().clear(); + MediaItem.getBytesBufferPool().clear();*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/AlbumPage.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/AlbumPage.java 2020-06-10 12:58:15.130620014 +0300 @@ -435,7 +435,7 @@ public class AlbumPage extends ActivityS @Override protected void onPause() { super.onPause(); - mIsActive = false; +/* mIsActive = false; if (mSelectionManager.inSelectionMode()) { mSelectionManager.leaveSelectionMode(); @@ -453,7 +453,7 @@ public class AlbumPage extends ActivityS mSyncTask.cancel(); mSyncTask = null; clearLoadingBit(BIT_LOADING_SYNC); - } + }*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/AlbumSetPage.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/AlbumSetPage.java 2020-06-10 12:58:15.137286681 +0300 @@ -434,7 +434,7 @@ public class AlbumSetPage extends Activi @Override public void onPause() { super.onPause(); - mIsActive = false; +/* mIsActive = false; mAlbumSetDataAdapter.pause(); mAlbumSetView.pause(); mActionModeHandler.pause(); @@ -448,7 +448,7 @@ public class AlbumSetPage extends Activi mSyncTask.cancel(); mSyncTask = null; clearLoadingBit(BIT_LOADING_SYNC); - } + }*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/GalleryActivity.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/GalleryActivity.java 2020-06-10 12:58:15.147286681 +0300 @@ -240,9 +240,9 @@ public final class GalleryActivity exten @Override protected void onPause() { super.onPause(); - if (mVersionCheckDialog != null) { +/* if (mVersionCheckDialog != null) { mVersionCheckDialog.dismiss(); - } + }*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/ManageCachePage.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/ManageCachePage.java 2020-06-10 12:58:15.153953347 +0300 @@ -229,7 +229,7 @@ public class ManageCachePage extends Act @Override public void onPause() { super.onPause(); - mAlbumSetDataAdapter.pause(); +/* mAlbumSetDataAdapter.pause(); mSelectionDrawer.pause(); mEyePosition.pause(); @@ -241,7 +241,7 @@ public class ManageCachePage extends Act FrameLayout layout = (FrameLayout) ((Activity) mActivity).findViewById(R.id.footer); layout.removeAllViews(); - layout.setVisibility(View.INVISIBLE); + layout.setVisibility(View.INVISIBLE);*/ } private Job mUpdateStorageInfoJob = new Job() { --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/MovieActivity.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/MovieActivity.java 2020-06-10 12:58:15.163953348 +0300 @@ -220,14 +220,14 @@ public class MovieActivity extends Activ @Override protected void onStop() { - ((AudioManager) getSystemService(AUDIO_SERVICE)) - .abandonAudioFocus(null); +/* ((AudioManager) getSystemService(AUDIO_SERVICE)) + .abandonAudioFocus(null);*/ super.onStop(); } @Override public void onPause() { - mPlayer.onPause(); +// mPlayer.onPause(); super.onPause(); } --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/MoviePlayer.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/MoviePlayer.java 2020-06-10 12:58:15.173953347 +0300 @@ -275,12 +275,12 @@ public class MoviePlayer implements } public void onPause() { - mHasPaused = true; +/* mHasPaused = true; mHandler.removeCallbacksAndMessages(null); mVideoPosition = mVideoView.getCurrentPosition(); mBookmarker.setBookmark(mUri, mVideoPosition, mVideoView.getDuration()); mVideoView.suspend(); - mResumeableTime = System.currentTimeMillis() + RESUMEABLE_TIMEOUT; + mResumeableTime = System.currentTimeMillis() + RESUMEABLE_TIMEOUT;*/ } public void onResume() { --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/PhotoPage.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/PhotoPage.java 2020-06-10 12:58:15.180620014 +0300 @@ -1294,7 +1294,7 @@ public abstract class PhotoPage extends @Override public void onPause() { super.onPause(); - mIsActive = false; +/* mIsActive = false; mActivity.getGLRoot().unfreeze(); mHandler.removeMessages(MSG_UNFREEZE_GLROOT); @@ -1315,7 +1315,7 @@ public abstract class PhotoPage extends } onCommitDeleteImage(); mMenuExecutor.pause(); - if (mMediaSet != null) mMediaSet.clearDeletion(); + if (mMediaSet != null) mMediaSet.clearDeletion();*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/SlideshowPage.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/SlideshowPage.java 2020-06-10 12:58:15.190620014 +0300 @@ -172,12 +172,12 @@ public class SlideshowPage extends Activ @Override public void onPause() { super.onPause(); - mIsActive = false; +/* mIsActive = false; mModel.pause(); mSlideshowView.release(); mHandler.removeMessages(MSG_LOAD_NEXT_BITMAP); - mHandler.removeMessages(MSG_SHOW_PENDING_BITMAP); + mHandler.removeMessages(MSG_SHOW_PENDING_BITMAP);*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/StateManager.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/StateManager.java 2020-06-10 12:58:15.200620015 +0300 @@ -61,7 +61,7 @@ public class StateManager { ActivityState top = getTopState(); top.transitionOnNextPause(top.getClass(), klass, StateTransitionAnimation.Transition.Incoming); - if (mIsResumed) top.onPause(); + //if (mIsResumed) top.onPause(); } UsageStatistics.onContentViewChanged( @@ -71,7 +71,7 @@ public class StateManager { mStack.push(new StateEntry(data, state)); state.onCreate(data, null); - if (mIsResumed) state.resume(); + //if (mIsResumed) state.resume(); } public void startStateForResult(Class klass, @@ -92,7 +92,7 @@ public class StateManager { as.transitionOnNextPause(as.getClass(), klass, StateTransitionAnimation.Transition.Incoming); as.mReceivedResults = state.mResult; - if (mIsResumed) as.onPause(); + //if (mIsResumed) as.onPause(); } else { mResult = state.mResult; } @@ -100,7 +100,7 @@ public class StateManager { klass.getSimpleName()); mStack.push(new StateEntry(data, state)); state.onCreate(data, null); - if (mIsResumed) state.resume(); + //if (mIsResumed) state.resume(); } public boolean createOptionsMenu(Menu menu) { @@ -124,9 +124,9 @@ public class StateManager { } public void pause() { - if (!mIsResumed) return; +/* if (!mIsResumed) return; mIsResumed = false; - if (!mStack.isEmpty()) getTopState().onPause(); + if (!mStack.isEmpty()) getTopState().onPause();*/ } public void notifyActivityResult(int requestCode, int resultCode, Intent data) { @@ -205,21 +205,21 @@ public class StateManager { mStack.pop(); state.mIsFinishing = true; ActivityState top = !mStack.isEmpty() ? mStack.peek().activityState : null; - if (mIsResumed && fireOnPause) { +/* if (mIsResumed && fireOnPause) { if (top != null) { state.transitionOnNextPause(state.getClass(), top.getClass(), StateTransitionAnimation.Transition.Outgoing); } state.onPause(); - } + } */ mActivity.getGLRoot().setContentPane(null); state.onDestroy(); - +/* if (top != null && mIsResumed) top.resume(); if (top != null) { UsageStatistics.onContentViewChanged(UsageStatistics.COMPONENT_GALLERY, top.getClass().getSimpleName()); - } + } */ } public void switchState(ActivityState oldState, @@ -237,7 +237,7 @@ public class StateManager { oldState.transitionOnNextPause(oldState.getClass(), klass, StateTransitionAnimation.Transition.Incoming); } - if (mIsResumed) oldState.onPause(); + //if (mIsResumed) oldState.onPause(); oldState.onDestroy(); // Create new state. @@ -250,7 +250,7 @@ public class StateManager { state.initialize(mActivity, data); mStack.push(new StateEntry(data, state)); state.onCreate(data, null); - if (mIsResumed) state.resume(); + //if (mIsResumed) state.resume(); UsageStatistics.onContentViewChanged(UsageStatistics.COMPONENT_GALLERY, klass.getSimpleName()); } --- a/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/app/TrimVideo.java 2020-06-10 12:58:15.207286681 +0300 @@ -124,19 +124,19 @@ public class TrimVideo extends Activity @Override public void onPause() { - mHasPaused = true; +/* mHasPaused = true; mHandler.removeCallbacksAndMessages(null); mVideoPosition = mVideoView.getCurrentPosition(); - mVideoView.suspend(); + mVideoView.suspend();*/ super.onPause(); } @Override public void onStop() { - if (mProgress != null) { +/* if (mProgress != null) { mProgress.dismiss(); mProgress = null; - } + }*/ super.onStop(); } --- a/packages/apps/Gallery2/src/com/android/gallery3d/filtershow/FilterShowActivity.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/filtershow/FilterShowActivity.java 2020-06-09 19:39:27.000000000 +0300 @@ -1019,17 +1019,17 @@ public class FilterShowActivity extends @Override public void onPause() { super.onPause(); - if (mShareActionProvider != null) { +/* if (mShareActionProvider != null) { mShareActionProvider.setOnShareTargetSelectedListener(null); - } + }*/ } @Override public void onResume() { super.onResume(); - if (mShareActionProvider != null) { +/* if (mShareActionProvider != null) { mShareActionProvider.setOnShareTargetSelectedListener(this); - } + }*/ } @Override --- a/packages/apps/Gallery2/src/com/android/gallery3d/ingest/IngestActivity.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/ingest/IngestActivity.java 2020-06-09 19:39:54.000000000 +0300 @@ -243,22 +243,22 @@ public class IngestActivity extends Acti @Override protected void onResume() { - DateTileView.refreshLocale(); +/* DateTileView.refreshLocale(); mActive = true; if (mHelperService != null) { mHelperService.setClientActivity(this); } - updateWarningView(); + updateWarningView();*/ super.onResume(); } @Override protected void onPause() { - if (mHelperService != null) { +/* if (mHelperService != null) { mHelperService.setClientActivity(null); } mActive = false; - cleanupProgressDialog(); + cleanupProgressDialog();*/ super.onPause(); } --- a/packages/apps/Gallery2/src/com/android/gallery3d/ui/GLRootView.java 2020-06-05 15:04:59.000000000 +0300 +++ b/packages/apps/Gallery2/src/com/android/gallery3d/ui/GLRootView.java 2020-06-09 19:40:31.000000000 +0300 @@ -531,14 +531,14 @@ public class GLRootView extends GLSurfac @Override public void onPause() { - unfreeze(); +// unfreeze(); super.onPause(); - if (DEBUG_PROFILE) { +/* if (DEBUG_PROFILE) { Log.d(TAG, "Stop profiling"); Profile.disableAll(); Profile.dumpToFile("/sdcard/gallery.prof"); Profile.reset(); - } + }*/ } @Override