summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorSanthosh Kumar H E <skhara@codeaurora.org>2013-11-29 12:45:08 +0530
committerSanthosh Kumar H E <skhara@codeaurora.org>2013-11-29 12:45:08 +0530
commitf4f601b164fb64d33d3ce09c6ac9e62269281dff (patch)
tree9f0973d34be9f2316e16827fd3a2c3311364c44b /src/com/android/camera/CameraActivity.java
parent1c7734057201ffd1b6d165d9e24793ef3d213043 (diff)
downloadandroid_packages_apps_Snap-f4f601b164fb64d33d3ce09c6ac9e62269281dff.tar.gz
android_packages_apps_Snap-f4f601b164fb64d33d3ce09c6ac9e62269281dff.tar.bz2
android_packages_apps_Snap-f4f601b164fb64d33d3ce09c6ac9e62269281dff.zip
Do not add screen hint dialog when window is not available.
SD card screen hint is directly added to activity window. In the error case its trying to add the screen hint dialog even before the activity window is available. This change check for the availability through window focus. In photo module update hint is called through handler to make sure it adds the dialog in UI thread, which was missing in panorama modo. This change as photomodule kind of UI updation calls in Panorama mode. Change-Id: I5cad2e86a23aceff290ef8d4ef89dbfdaaeb683d CRs-Fixed: 573549
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index df2195844..1b04c7bd0 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -305,7 +305,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) {
@@ -370,7 +370,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() {
@@ -1164,7 +1164,6 @@ public class CameraActivity extends Activity
}
mLocalImagesObserver.setActivityPaused(false);
mLocalVideosObserver.setActivityPaused(false);
- updateStorageSpaceAndHint();
}
@Override