From 377b06525ef4e6028919a57383278e0fd07de1ea Mon Sep 17 00:00:00 2001
From: Ray Chen <raychen@google.com>
Date: Tue, 11 Oct 2011 12:49:45 +0800
Subject: [PATCH] Fix 5199444 In crop interface, check button and X button
 should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together
 in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP)

Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
---
 res/menu/crop.xml                            |  4 +---
 src/com/android/gallery3d/app/CropImage.java | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/res/menu/crop.xml b/res/menu/crop.xml
index 1dab8e730..aa0e03540 100644
--- a/res/menu/crop.xml
+++ b/res/menu/crop.xml
@@ -15,12 +15,10 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/cancel"
-            android:icon="@drawable/ic_menu_cancel_holo_light"
             android:title="@android:string/cancel"
-            android:showAsAction="always">
+            android:showAsAction="always|withText">
     </item>
     <item android:id="@+id/save"
-            android:icon="@drawable/ic_menu_save_holo_light"
             android:title="@string/crop_save_text"
             android:showAsAction="always|withText">
     </item>
diff --git a/src/com/android/gallery3d/app/CropImage.java b/src/com/android/gallery3d/app/CropImage.java
index 14d8be0ef..a0fb0f89d 100644
--- a/src/com/android/gallery3d/app/CropImage.java
+++ b/src/com/android/gallery3d/app/CropImage.java
@@ -16,19 +16,20 @@
 
 package com.android.gallery3d.app;
 
+import android.app.ActionBar;
 import android.app.ProgressDialog;
 import android.app.WallpaperManager;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
-import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapRegionDecoder;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Bitmap.Config;
 import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Bundle;
@@ -153,6 +154,10 @@ public class CropImage extends AbstractGalleryActivity {
         mCropView = new CropView(this);
         getGLRoot().setContentPane(mCropView);
 
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP,
+                ActionBar.DISPLAY_HOME_AS_UP);
+
         mMainHandler = new SynchronizedHandler(getGLRoot()) {
             @Override
             public void handleMessage(Message message) {
@@ -203,6 +208,10 @@ public class CropImage extends AbstractGalleryActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home: {
+                finish();
+                break;
+            }
             case R.id.cancel: {
                 setResult(RESULT_CANCELED);
                 finish();
@@ -217,7 +226,7 @@ public class CropImage extends AbstractGalleryActivity {
     }
 
     private class SaveOutput implements Job<Intent> {
-        private RectF mCropRect;
+        private final RectF mCropRect;
 
         public SaveOutput(RectF cropRect) {
             mCropRect = cropRect;
-- 
2.11.0