From c30b1637dd9bcbb74aa697365e52156cd956135e Mon Sep 17 00:00:00 2001 From: zdi Date: Fri, 26 Feb 2016 13:55:04 +0800 Subject: Gallery2: Adjust the UI in trim video. Adjust the UI in trim video according to UX specification document. Change-Id: I46d06355f0f5c835acf123f4d44466306e831a9a CRs-Fixed: 986776 --- src/com/android/gallery3d/app/TimeBar.java | 2 +- src/com/android/gallery3d/app/TrimControllerOverlay.java | 2 ++ src/com/android/gallery3d/app/TrimTimeBar.java | 2 +- src/com/android/gallery3d/app/TrimVideo.java | 10 ++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/gallery3d/app/TimeBar.java b/src/com/android/gallery3d/app/TimeBar.java index 1d08989aa..7bd37b1cd 100755 --- a/src/com/android/gallery3d/app/TimeBar.java +++ b/src/com/android/gallery3d/app/TimeBar.java @@ -244,7 +244,7 @@ public class TimeBar extends View { mScrubberTop = progressY - mScrubber.getHeight() / 2 + 1; mProgressBar.set( getPaddingLeft() + margin, progressY, - w - getPaddingRight() - margin, progressY + 4); + w - getPaddingRight() - margin, progressY + 6); } update(); } diff --git a/src/com/android/gallery3d/app/TrimControllerOverlay.java b/src/com/android/gallery3d/app/TrimControllerOverlay.java index 9d2e7aee1..5bf3b03a5 100644 --- a/src/com/android/gallery3d/app/TrimControllerOverlay.java +++ b/src/com/android/gallery3d/app/TrimControllerOverlay.java @@ -23,6 +23,7 @@ import android.content.Context; import android.view.MotionEvent; import android.view.View; +import com.android.gallery3d.R; import com.android.gallery3d.common.ApiHelper; /** @@ -32,6 +33,7 @@ public class TrimControllerOverlay extends CommonControllerOverlay { public TrimControllerOverlay(Context context) { super(context); + mPlayPauseReplayView.setBackgroundResource(R.drawable.bg_vidcontrol); } @Override diff --git a/src/com/android/gallery3d/app/TrimTimeBar.java b/src/com/android/gallery3d/app/TrimTimeBar.java index cf6618892..7e26b2860 100644 --- a/src/com/android/gallery3d/app/TrimTimeBar.java +++ b/src/com/android/gallery3d/app/TrimTimeBar.java @@ -181,7 +181,7 @@ public class TrimTimeBar extends TimeBar { mTrimEndScrubberTop = progressY; mProgressBar.set( getPaddingLeft() + margin, progressY, - w - getPaddingRight() - margin, progressY + 4); + w - getPaddingRight() - margin, progressY + 6); } update(); } diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java index a52c25606..37da98a4e 100644 --- a/src/com/android/gallery3d/app/TrimVideo.java +++ b/src/com/android/gallery3d/app/TrimVideo.java @@ -29,6 +29,7 @@ import android.provider.MediaStore; import android.view.View; import android.view.ViewGroup; import android.view.Window; +import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; import android.widget.VideoView; @@ -47,6 +48,7 @@ public class TrimVideo extends Activity implements private VideoView mVideoView; private TextView mSaveVideoTextView; + private ImageView mExitImageView; private TrimControllerOverlay mController; private Context mContext; private Uri mUri; @@ -83,6 +85,14 @@ public class TrimVideo extends Activity implements actionBar.setDisplayOptions(displayOptions, displayOptions); actionBar.setCustomView(R.layout.trim_menu); + mExitImageView = (ImageView) findViewById(R.id.exit_trim); + mExitImageView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + mSaveVideoTextView = (TextView) findViewById(R.id.start_trim); mSaveVideoTextView.setOnClickListener(new View.OnClickListener() { @Override -- cgit v1.2.3