Merge "Gallery2: Adjust the layout of trim video and Audio+." into android_ui.lnx.1.2-dev

3 files changed, 47 insertions, 18 deletions

diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java
index aed8eeccc..f66dfdfcd 100755
--- a/src/com/android/gallery3d/app/TimeBar.java
+++ b/src/com/android/gallery3d/app/TimeBar.java
@@ -91,7 +91,7 @@ public class TimeBar extends View {
 
     private ITimeBarSecondaryProgressExt mSecondaryProgressExt = new TimeBarSecondaryProgressExtImpl();
     private ITimeBarInfoExt mInfoExt = new TimeBarInfoExtImpl();
-    private ITimeBarLayoutExt mLayoutExt = new TimeBarLayoutExtImpl();
+    protected ITimeBarLayoutExt mLayoutExt = new TimeBarLayoutExtImpl();
 
     public TimeBar(Context context, Listener listener) {
         super(context);
diff --git a/src/com/android/gallery3d/app/TrimTimeBar.java b/src/com/android/gallery3d/app/TrimTimeBar.java
index 7e26b2860..8dad597a1 100644
--- a/src/com/android/gallery3d/app/TrimTimeBar.java
+++ b/src/com/android/gallery3d/app/TrimTimeBar.java
@@ -49,6 +49,9 @@ public class TrimTimeBar extends TimeBar {
     private int mTrimStartTime;
     private int mTrimEndTime;
 
+    private int mTimeBarMargin;
+    private int mTimeBarTimeMargin;
+
     private final Bitmap mTrimStartScrubber;
     private final Bitmap mTrimEndScrubber;
     public TrimTimeBar(Context context, Listener listener) {
@@ -69,6 +72,9 @@ public class TrimTimeBar extends TimeBar {
         // touch padding since we have 3 scrubbers now.
         mScrubberPadding = 0;
         mVPaddingInPx = mVPaddingInPx * 3 / 2;
+        mTimeBarMargin = context.getResources().getDimensionPixelSize(R.dimen.timebar_margin);
+        mTimeBarTimeMargin = context.getResources().
+                getDimensionPixelSize(R.dimen.timebar_time_margin);
     }
 
     private int getBarPosFromTime(int time) {
@@ -174,14 +180,14 @@ public class TrimTimeBar extends TimeBar {
             if (mShowTimes) {
                 margin += mTimeBounds.width();
             }
-            int progressY = h / 4;
-            int scrubberY = progressY - mScrubber.getHeight() / 2 + 1;
-            mScrubberTop = scrubberY;
+            margin = mLayoutExt.getProgressMargin(margin);
+            int progressY = (h + mScrubberPadding) / 2;
             mTrimStartScrubberTop = progressY;
             mTrimEndScrubberTop = progressY;
+            mScrubberTop = progressY - mScrubber.getHeight() / 2 + 1;
             mProgressBar.set(
-                    getPaddingLeft() + margin, progressY,
-                    w - getPaddingRight() - margin, progressY + 6);
+                    mTimeBarMargin + margin, progressY,
+                    w - mTimeBarMargin - margin, progressY + 6);
         }
         update();
     }
@@ -191,18 +197,19 @@ public class TrimTimeBar extends TimeBar {
         // draw progress bars
         canvas.drawRect(mProgressBar, mProgressPaint);
         canvas.drawRect(mPlayedBar, mPlayedPaint);
-
         if (mShowTimes) {
-            canvas.drawText(
-                    stringForTime(mTrimStartTime),
-                            mTimeBounds.width() / 2 + getPaddingLeft(),
-                            mTimeBounds.height() / 2 +  mTrimStartScrubberTop,
-                    mTimeTextPaint);
-            canvas.drawText(
-                    stringForTime(mTrimEndTime),
-                            getWidth() - getPaddingRight() - mTimeBounds.width() / 2,
-                            mTimeBounds.height() / 2 +  mTrimStartScrubberTop,
-                    mTimeTextPaint);
+                canvas.drawText(
+                        stringForTime(mCurrentTime),
+                        mTimeBarTimeMargin,
+                        mTimeBounds.height() + mVPaddingInPx / 2 + mScrubberPadding -
+                                mLayoutExt.getProgressOffset(mTimeBounds),
+                        mTimeTextPaint);
+                canvas.drawText(
+                        stringForTime(mTotalTime),
+                        getWidth() - mTimeBarTimeMargin,
+                        mTimeBounds.height() + mVPaddingInPx / 2 + mScrubberPadding -
+                                mLayoutExt.getProgressOffset(mTimeBounds),
+                        mTimeTextPaint);
         }
 
         // draw extra scrubbers
diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index 37da98a4e..6905e62d5 100644
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -18,8 +18,10 @@ package com.android.gallery3d.app;
 
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -50,6 +52,7 @@ public class TrimVideo extends Activity implements
     private TextView mSaveVideoTextView;
     private ImageView mExitImageView;
     private TrimControllerOverlay mController;
+    private AlertDialog mExitDialog;
     private Context mContext;
     private Uri mUri;
     private final Handler mHandler = new Handler();
@@ -89,7 +92,26 @@ public class TrimVideo extends Activity implements
         mExitImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                finish();
+                mExitDialog = new AlertDialog.Builder(TrimVideo.this,
+                        AlertDialog.THEME_DEVICE_DEFAULT_LIGHT).
+                        setTitle(R.string.trim_video_exit_title).
+                        setMessage(R.string.trim_video_exit_msg).
+                        setPositiveButton(R.string.trim_video_exit_discard,
+                                new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                finish();
+                            }
+                        }).
+                        setNegativeButton(R.string.review_cancel,
+                                new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        }).
+                        create();
+                mExitDialog.show();
             }
         });