From: Doris Liu <tianliu@google.com>
Date: Tue, 16 Oct 2012 18:18:58 +0000 (-0700)
Subject: Make save button in video trimming consistent
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~766^2~188
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7a0b0926258acc67c9d447c880b9ae8be96333d;p=android-x86%2Fpackages-apps-Camera2.git

Make save button in video trimming consistent

Bug: 7353884

Updated save button icon and text
Save button in video trimming now acts like back button when no change
has been made.
Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
---

diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
index d2af918aa..b61922083 100644
--- a/res/layout/trim_menu.xml
+++ b/res/layout/trim_menu.xml
@@ -23,8 +23,10 @@
         android:layout_marginLeft="8dp"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:text="@string/done"
+        android:text="@string/save"
+        android:textAllCaps="true"
+        android:textSize="14sp"
         android:gravity="left|center_vertical"
-        android:drawableLeft="@drawable/ic_menu_save_holo_light"
+        android:drawableLeft="@drawable/ic_menu_savephoto"
         android:drawablePadding="8dp" />
 </FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f6453891..c56af3fdd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -495,9 +495,6 @@
     <!-- Toast if the trimmed video is too short to trim. [CHAR LIMIT=80] -->
     <string name="trim_too_short">Can not trim : target video is too short</string>
 
-    <!-- Toast if the trimmed video is the same as the original one. [CHAR LIMIT=80] -->
-    <string name="trim_too_long">Did not trim : the same length as origin</string>
-
     <!-- Text to show with progress bar while stitching in Gallery -->
     <string name="pano_progress_text">Rendering panorama</string>
 
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index 09a2abdf0..01fe462c2 100644
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -268,9 +268,8 @@ public class TrimVideo extends Activity implements
             return;
         }
         if (Math.abs(mVideoView.getDuration() - delta) < 100) {
-            Toast.makeText(getApplicationContext(),
-                getString(R.string.trim_too_long),
-                Toast.LENGTH_SHORT).show();
+            // If no change has been made, go back
+            onBackPressed();
             return;
         }
         // Use the default save directory if the source directory cannot be