diff options
-rw-r--r-- | res/layout/trim_view.xml | 27 | ||||
-rw-r--r-- | res/menu/trim.xml | 22 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
3 files changed, 53 insertions, 1 deletions
diff --git a/res/layout/trim_view.xml b/res/layout/trim_view.xml new file mode 100644 index 000000000..c95c719c1 --- /dev/null +++ b/res/layout/trim_view.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/trim_view_root" + android:background="@android:color/black" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <VideoView android:id="@+id/surface_view" + android:visibility="visible" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerInParent="true" /> +</RelativeLayout>
\ No newline at end of file diff --git a/res/menu/trim.xml b/res/menu/trim.xml new file mode 100644 index 000000000..937081f24 --- /dev/null +++ b/res/menu/trim.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 Google Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:id="@+id/action_trim_video" + android:icon="@drawable/ic_menu_slideshow_holo_light" + android:title="@string/trim_action" + android:enabled="true" + android:showAsAction="ifRoom" /> +</menu> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0e00338d9..ed121d4ac 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -73,8 +73,11 @@ <!-- Eorror toast message that the image cannot be saved [CHAR LIMIT=40]--> <string name="save_error">Couldn\'t save cropped image.</string> - <!-- menu pick: crop the currently selected image --> + <!-- menu pick: crop the currently selected image [CHAR LIMIT=30]--> <string name="crop_label">Crop picture</string> + <!-- menu pick: trim the currently selected video [CHAR LIMIT=30]--> + <string name="trim_label">Trim video</string> + <!-- Toast/alert that the face detection is being run --> <!-- Title prompted for user to choose a photo item [CHAR LIMIT=20] --> |