diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-17 17:53:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-17 17:53:09 -0700 |
| commit | d2d85e03dbad97293aa101183c6ff12d98efba55 (patch) | |
| tree | af3cf44ec494a07343b06787b1a72778e27f436a /src | |
| parent | ebb7945b87d7feab994e88e9ca666b9f2e173763 (diff) | |
| parent | 38779f3d24bd9ec3f3b44db587a97b7aecdea281 (diff) | |
| download | android_packages_apps_Snap-d2d85e03dbad97293aa101183c6ff12d98efba55.tar.gz android_packages_apps_Snap-d2d85e03dbad97293aa101183c6ff12d98efba55.tar.bz2 android_packages_apps_Snap-d2d85e03dbad97293aa101183c6ff12d98efba55.zip | |
Merge "SnapdragonCamera: Don't display metadata in paused state"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 8968377e9..49fa4e99d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -212,6 +212,7 @@ public class CameraActivity extends Activity private boolean mIsEditActivityInProgress = false; private View mPreviewCover; private FrameLayout mPreviewContentLayout; + private boolean mPaused = true; private Uri[] mNfcPushUris = new Uri[1]; @@ -1307,7 +1308,7 @@ public class CameraActivity extends Activity @Override protected void onPostExecute(MediaDetails mediaDetails) { - if (mediaDetails != null) { + if ((mediaDetails != null) && !mPaused) { DetailsDialog.create(CameraActivity.this, mediaDetails).show(); } } @@ -1570,6 +1571,7 @@ public class CameraActivity extends Activity super.onPause(); mCurrentModule.onPauseAfterSuper(); + mPaused = true; mLocalImagesObserver.setActivityPaused(true); mLocalVideosObserver.setActivityPaused(true); } @@ -1595,6 +1597,7 @@ public class CameraActivity extends Activity mOrientationListener.enable(); mCurrentModule.onResumeBeforeSuper(); super.onResume(); + mPaused = false; mCurrentModule.onResumeAfterSuper(); setSwipingEnabled(true); |