am 6b6a6d59: Make CropImage always fullscreen.

Merge commit '6b6a6d59ee9d4375a64265ff5e784f2356eabf96'

* commit '6b6a6d59ee9d4375a64265ff5e784f2356eabf96':
  Make CropImage always fullscreen.

5 files changed, 3 insertions, 9 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 5d53a72..1db7862 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -908,7 +908,6 @@ public class Camera extends Activity implements View.OnClickListener,
             } else {
                 newExtras.putBoolean("return-data", true);
             }
-            newExtras.putBoolean(MediaStore.EXTRA_FULL_SCREEN, true);
 
             Intent cropIntent = new Intent();
             cropIntent.setClass(Camera.this, CropImage.class);
diff --git a/src/com/android/camera/CropImage.java b/src/com/android/camera/CropImage.java
index 53c5f7c..f921905 100644
--- a/src/com/android/camera/CropImage.java
+++ b/src/com/android/camera/CropImage.java
@@ -125,11 +125,6 @@ public class CropImage extends MonitoredActivity {
             mDoFaceDetection = extras.containsKey("noFaceDetection")
                     ? !extras.getBoolean("noFaceDetection")
                     : true;
-
-            if (intent.getBooleanExtra(MediaStore.EXTRA_FULL_SCREEN, true)) {
-                getWindow().addFlags(
-                        WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            }
         }
 
         if (mBitmap == null) {
@@ -151,6 +146,9 @@ public class CropImage extends MonitoredActivity {
             return;
         }
 
+        // Make UI fullscreen.
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
         findViewById(R.id.discard).setOnClickListener(
                 new View.OnClickListener() {
                     public void onClick(View v) {
diff --git a/src/com/android/camera/ImageGallery.java b/src/com/android/camera/ImageGallery.java
index 795fcc2..95b2ff8 100644
--- a/src/com/android/camera/ImageGallery.java
+++ b/src/com/android/camera/ImageGallery.java
@@ -296,7 +296,6 @@ public class ImageGallery extends Activity implements
             if (cropValue.equals("circle")) {
                 newExtras.putString("circleCrop", "true");
             }
-            newExtras.putBoolean(MediaStore.EXTRA_FULL_SCREEN, true);
 
             Intent cropIntent = new Intent();
             cropIntent.setData(img.fullSizeImageUri());
diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java
index d475ad8..6c0c58d 100644
--- a/src/com/android/camera/MenuHelper.java
+++ b/src/com/android/camera/MenuHelper.java
@@ -555,7 +555,6 @@ public class MenuHelper {
                 Intent cropIntent = new Intent();
                 cropIntent.setClass(activity, CropImage.class);
                 cropIntent.setData(u);
-                cropIntent.putExtra(MediaStore.EXTRA_FULL_SCREEN, true);
                 activity.startActivityForResult(cropIntent,
                         RESULT_COMMON_MENU_CROP);
             }
diff --git a/src/com/android/camera/Wallpaper.java b/src/com/android/camera/Wallpaper.java
index 972bacf..0b053ce 100644
--- a/src/com/android/camera/Wallpaper.java
+++ b/src/com/android/camera/Wallpaper.java
@@ -143,7 +143,6 @@ public class Wallpaper extends Activity {
             intent.setClassName("com.android.camera",
                                 "com.android.camera.CropImage");
             intent.setData(imageToUse);
-            intent.putExtra(MediaStore.EXTRA_FULL_SCREEN, true);
             formatIntent(intent);
             startActivityForResult(intent, CROP_DONE);
         } else {