1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index d459740..8126a1b 100644
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -62,6 +62,7 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.OrientationEventListener;
 import android.view.View;
+import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
@@ -211,9 +212,11 @@ public class PanoramaActivity extends Activity implements
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+        Window window = getWindow();
+        window.setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                 WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        Util.enterLightsOutMode(getWindow());
+        Util.enterLightsOutMode(window);
+        Util.initializeScreenBrightness(window, getContentResolver());
 
         createContentView();
 
@@ -252,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();