diff options
| author | Angus Kong <shkong@google.com> | 2011-09-19 20:14:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-19 20:14:35 -0700 |
| commit | 61afc876d9a8ee6bd314fe25f5bc0c83d51077d6 (patch) | |
| tree | d1c763b4d21c8537111dd027002915aa9b99a074 /src | |
| parent | a555a5681f964aaace10c79ecf4659c3fec3df50 (diff) | |
| parent | 3eaaa3f1fc7b3079e0edc66ed61d5e48b7cc44cc (diff) | |
| download | LegacyCamera-61afc876d9a8ee6bd314fe25f5bc0c83d51077d6.zip LegacyCamera-61afc876d9a8ee6bd314fe25f5bc0c83d51077d6.tar.gz LegacyCamera-61afc876d9a8ee6bd314fe25f5bc0c83d51077d6.tar.bz2 | |
Merge "Dialog is now shown when pausing. (DO NOT MERGE)" into ics-factoryrom
Diffstat (limited to 'src')
| -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(); |