diff options
19 files changed, 63 insertions, 5 deletions
diff --git a/res/drawable-hdpi/bg_vidcontrol.png b/res/drawable-hdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index dfe2da136..000000000 --- a/res/drawable-hdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-hdpi/text_select_handle_left.png b/res/drawable-hdpi/text_select_handle_left.png Binary files differindex d2ed06dd5..abefa9ebd 100644 --- a/res/drawable-hdpi/text_select_handle_left.png +++ b/res/drawable-hdpi/text_select_handle_left.png diff --git a/res/drawable-hdpi/text_select_handle_right.png b/res/drawable-hdpi/text_select_handle_right.png Binary files differindex e4192499b..5679a1739 100644 --- a/res/drawable-hdpi/text_select_handle_right.png +++ b/res/drawable-hdpi/text_select_handle_right.png diff --git a/res/drawable-mdpi/bg_vidcontrol.png b/res/drawable-mdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index 5a5ce5571..000000000 --- a/res/drawable-mdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-mdpi/text_select_handle_left.png b/res/drawable-mdpi/text_select_handle_left.png Binary files differindex 750cdea50..2ef6f7cfa 100644 --- a/res/drawable-mdpi/text_select_handle_left.png +++ b/res/drawable-mdpi/text_select_handle_left.png diff --git a/res/drawable-mdpi/text_select_handle_right.png b/res/drawable-mdpi/text_select_handle_right.png Binary files differindex fc3d14497..9e426c764 100644 --- a/res/drawable-mdpi/text_select_handle_right.png +++ b/res/drawable-mdpi/text_select_handle_right.png diff --git a/res/drawable-sw600dp/bg_vidcontrol.png b/res/drawable-sw600dp/bg_vidcontrol.png Binary files differdeleted file mode 100644 index dfe2da136..000000000 --- a/res/drawable-sw600dp/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_vidcontrol.png b/res/drawable-xhdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index 0eb814815..000000000 --- a/res/drawable-xhdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-xhdpi/text_select_handle_left.png b/res/drawable-xhdpi/text_select_handle_left.png Binary files differindex 98d10c929..cfa3bb0c8 100644 --- a/res/drawable-xhdpi/text_select_handle_left.png +++ b/res/drawable-xhdpi/text_select_handle_left.png diff --git a/res/drawable-xhdpi/text_select_handle_right.png b/res/drawable-xhdpi/text_select_handle_right.png Binary files differindex b3a0c9f47..90c8869bb 100644 --- a/res/drawable-xhdpi/text_select_handle_right.png +++ b/res/drawable-xhdpi/text_select_handle_right.png diff --git a/res/drawable-xxhdpi/text_select_handle_left.png b/res/drawable-xxhdpi/text_select_handle_left.png Binary files differnew file mode 100644 index 000000000..dbfa59c83 --- /dev/null +++ b/res/drawable-xxhdpi/text_select_handle_left.png diff --git a/res/drawable-xxhdpi/text_select_handle_right.png b/res/drawable-xxhdpi/text_select_handle_right.png Binary files differnew file mode 100644 index 000000000..f16101709 --- /dev/null +++ b/res/drawable-xxhdpi/text_select_handle_right.png diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml new file mode 100644 index 000000000..fcfacf183 --- /dev/null +++ b/res/drawable/bg_vidcontrol.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, The Linux Foundation. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="48.0" + android:viewportWidth="48.0"> + <path + android:fillColor="#FF000000" + android:fillAlpha="0.5" + android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> +</vector> diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml index c46be4c4b..164264546 100644 --- a/res/layout/trim_menu.xml +++ b/res/layout/trim_menu.xml @@ -18,6 +18,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true"> + <ImageView + android:id="@+id/exit_trim" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/cancel"/> <TextView android:id="@+id/start_trim" android:layout_marginStart="8dp" @@ -25,8 +30,9 @@ android:layout_height="match_parent" android:text="@string/save" android:textAllCaps="true" - android:textSize="14sp" + android:layout_gravity="right" + android:textSize="16sp" + android:textColor="@color/primary_text" android:gravity="left|center_vertical" - android:drawableStart="@drawable/menu_save_photo" android:drawablePadding="8dp" /> </FrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7bf28763a..516c5be99 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -543,7 +543,7 @@ <string name="pano_progress_text">Rendering panorama</string> <!-- The label on the button that will save an edited image --> - <string name="save" msgid="8140440041190264400">Done</string> + <string name="save" msgid="8140440041190264400">Save</string> <!-- A label representing the action of importing media item(s) [CHAR LIMIT=20] --> <string name="ingest_import">@string/Import</string> 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 |
