diff options
| author | Angus Kong <shkong@google.com> | 2011-09-20 09:15:57 +0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2011-09-20 09:15:57 +0800 |
| commit | 3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc (patch) | |
| tree | b868441606fc10a297caf1717b6d4a6d57cc9d08 /src/com | |
| parent | e197758482d031994a2040cb9d0da87bc436c7ca (diff) | |
| download | LegacyCamera-3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc.zip LegacyCamera-3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc.tar.gz LegacyCamera-3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc.tar.bz2 | |
Dialog is now shown when pausing. (DO NOT MERGE)
This fix is already submitted in master build. Submit again for factoryROM.
bug:5317261
Change-Id: I2f4a1153322c16ddf52a30a1b17195ddec96e4ec
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/panorama/PanoramaActivity.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java index 2bb9f6c..8126a1b 100644 --- a/src/com/android/camera/panorama/PanoramaActivity.java +++ b/src/com/android/camera/panorama/PanoramaActivity.java @@ -255,7 +255,11 @@ public class PanoramaActivity extends Activity implements break; case MSG_GENERATE_FINAL_MOSAIC_ERROR: onBackgroundThreadFinished(); - mAlertDialog.show(); + if (mPausing) { + resetToPreview(); + } else { + mAlertDialog.show(); + } break; case MSG_RESET_TO_PREVIEW: onBackgroundThreadFinished(); |