diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-12-07 11:10:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-12-07 11:10:37 -0800 |
| commit | 48276bba29ecbf66b474789d857f08b413864ca0 (patch) | |
| tree | 8190240ad0bd2d17015cc7be60bb7d301051f8e4 /src/com | |
| parent | 444ba7367f7aa98de1a23b2ea3d5e4557c326e85 (diff) | |
| parent | f4f601b164fb64d33d3ce09c6ac9e62269281dff (diff) | |
| download | android_packages_apps_Snap-48276bba29ecbf66b474789d857f08b413864ca0.tar.gz android_packages_apps_Snap-48276bba29ecbf66b474789d857f08b413864ca0.tar.bz2 android_packages_apps_Snap-48276bba29ecbf66b474789d857f08b413864ca0.zip | |
Merge "Do not add screen hint dialog when window is not available."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 | ||||
| -rw-r--r-- | src/com/android/camera/WideAnglePanoramaModule.java | 7 |
3 files changed, 14 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 9e5ddb0b2..3351eb142 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -336,7 +336,7 @@ public class CameraActivity extends Activity @Override public void onDataFullScreenChange(int dataID, boolean full) { boolean isCameraID = isCameraPreview(dataID); - if (full && isCameraID){ + if (full && isCameraID && CameraActivity.this.hasWindowFocus()){ updateStorageSpaceAndHint(); } if (!isCameraID) { @@ -403,7 +403,7 @@ public class CameraActivity extends Activity public void onDataFocusChanged(final int dataID, final boolean focused) { boolean isPreview = isCameraPreview(dataID); boolean isFullScreen = mFilmStripView.inFullScreen(); - if (isFullScreen && isPreview){ + if (isFullScreen && isPreview && CameraActivity.this.hasWindowFocus()){ runOnUiThread(new Runnable() { @Override public void run() { @@ -1282,7 +1282,6 @@ public class CameraActivity extends Activity } mLocalImagesObserver.setActivityPaused(false); mLocalVideosObserver.setActivityPaused(false); - updateStorageSpaceAndHint(); } @Override diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index a0877eebf..a87786a29 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -866,6 +866,12 @@ public class VideoModule implements CameraModule, UsageStatistics.onContentViewChanged( UsageStatistics.COMPONENT_CAMERA, "VideoModule"); + mHandler.post(new Runnable(){ + @Override + public void run(){ + mActivity.updateStorageSpaceAndHint(); + } + }); } private void setDisplayOrientation() { diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java index 85f983ea8..2a7ac9650 100644 --- a/src/com/android/camera/WideAnglePanoramaModule.java +++ b/src/com/android/camera/WideAnglePanoramaModule.java @@ -916,7 +916,12 @@ public class WideAnglePanoramaModule mPreviewUIWidth = size.x; mPreviewUIHeight = size.y; configMosaicPreview(); - mActivity.updateStorageSpaceAndHint(); + mMainHandler.post(new Runnable(){ + @Override + public void run(){ + mActivity.updateStorageSpaceAndHint(); + } + }); } keepScreenOnAwhile(); |