From 63b2c37cc8cdf3c2266f834ed9c9b8ff6f89e380 Mon Sep 17 00:00:00 2001 From: zdi Date: Mon, 18 Apr 2016 15:21:47 +0800 Subject: Gallery2: Adjust the layout of trim video and Audio+. Adjust the view of trim and Audio+ according to UX specification document. Change-Id: I20066bace85c1956e7a27e5e63bd6eeeedca183e CRs-Fixed: 1003393 --- res/drawable-hdpi/ic_vidcontrol_reload.png | Bin 1940 -> 0 bytes res/drawable-mdpi/ic_vidcontrol_reload.png | Bin 1208 -> 0 bytes res/drawable-sw600dp/ic_vidcontrol_reload.png | Bin 1940 -> 0 bytes res/drawable-xhdpi/ic_vidcontrol_reload.png | Bin 2694 -> 0 bytes res/drawable/ic_vidcontrol_reload.xml | 39 +++++++++++++++++++++++++ res/layout/audio_effects_dialog.xml | 3 +- res/values-zh-rCN/strings.xml | 6 +++- res/values/dimens.xml | 2 ++ res/values/strings.xml | 8 +++-- src/com/android/gallery3d/app/TimeBar.java | 2 +- src/com/android/gallery3d/app/TrimTimeBar.java | 39 +++++++++++++++---------- src/com/android/gallery3d/app/TrimVideo.java | 24 ++++++++++++++- 12 files changed, 101 insertions(+), 22 deletions(-) delete mode 100644 res/drawable-hdpi/ic_vidcontrol_reload.png delete mode 100644 res/drawable-mdpi/ic_vidcontrol_reload.png delete mode 100644 res/drawable-sw600dp/ic_vidcontrol_reload.png delete mode 100644 res/drawable-xhdpi/ic_vidcontrol_reload.png create mode 100644 res/drawable/ic_vidcontrol_reload.xml diff --git a/res/drawable-hdpi/ic_vidcontrol_reload.png b/res/drawable-hdpi/ic_vidcontrol_reload.png deleted file mode 100644 index bf8d5299c..000000000 Binary files a/res/drawable-hdpi/ic_vidcontrol_reload.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_vidcontrol_reload.png b/res/drawable-mdpi/ic_vidcontrol_reload.png deleted file mode 100644 index 51b1f4834..000000000 Binary files a/res/drawable-mdpi/ic_vidcontrol_reload.png and /dev/null differ diff --git a/res/drawable-sw600dp/ic_vidcontrol_reload.png b/res/drawable-sw600dp/ic_vidcontrol_reload.png deleted file mode 100644 index bf8d5299c..000000000 Binary files a/res/drawable-sw600dp/ic_vidcontrol_reload.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_vidcontrol_reload.png b/res/drawable-xhdpi/ic_vidcontrol_reload.png deleted file mode 100644 index 2aaf4919a..000000000 Binary files a/res/drawable-xhdpi/ic_vidcontrol_reload.png and /dev/null differ diff --git a/res/drawable/ic_vidcontrol_reload.xml b/res/drawable/ic_vidcontrol_reload.xml new file mode 100644 index 000000000..c0a42844a --- /dev/null +++ b/res/drawable/ic_vidcontrol_reload.xml @@ -0,0 +1,39 @@ + + + + + + diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml index b2143d643..a14cd1e54 100644 --- a/res/layout/audio_effects_dialog.xml +++ b/res/layout/audio_effects_dialog.xml @@ -54,6 +54,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "低音增强" - "3D 音效" + "环绕声" "音效" “插入耳机体验音效” 美白 @@ -468,4 +468,8 @@ 列表视图 没有图片 没有视频 + + 放弃更改？ + 是否放弃对当前影片的操作？ + 放弃 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index a3115eb7c..ea0ced68e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -209,5 +209,7 @@ 14sp 60dp + 30dp + 45dp 12dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 7d33f8a15..336962488 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,5 +1,5 @@ - Bass boost - 3D effect + Surround sound Audio effects @@ -1193,4 +1193,8 @@ CHAR LIMIT = NONE] --> See Straight Input image is too small to process. Couldn\'t process the image. + + Discard changes? + Discard the changes made to this video? + DISCARD 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(); } }); -- cgit v1.2.3