summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-09-26 16:34:44 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-09-27 12:19:00 -0700
commit90a84cc76823f691506fc5bd4a40778472f094e9 (patch)
tree5fd4e03e0aef118aafa18d2c2eb74e9862910299 /res
parent3f81eebebdcd1183eb422562e5a2b8a4dfcdd96a (diff)
downloadandroid_packages_apps_Snap-90a84cc76823f691506fc5bd4a40778472f094e9.tar.gz
android_packages_apps_Snap-90a84cc76823f691506fc5bd4a40778472f094e9.tar.bz2
android_packages_apps_Snap-90a84cc76823f691506fc5bd4a40778472f094e9.zip
Trimming: clean up the UI for trimming.
Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
Diffstat (limited to 'res')
-rw-r--r--res/layout/trim_menu.xml30
-rw-r--r--res/menu/trim.xml21
2 files changed, 30 insertions, 21 deletions
diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml
new file mode 100644
index 000000000..d2af918aa
--- /dev/null
+++ b/res/layout/trim_menu.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true">
+ <TextView
+ android:id="@+id/start_trim"
+ android:layout_marginLeft="8dp"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:text="@string/done"
+ android:gravity="left|center_vertical"
+ android:drawableLeft="@drawable/ic_menu_save_holo_light"
+ android:drawablePadding="8dp" />
+</FrameLayout>
diff --git a/res/menu/trim.xml b/res/menu/trim.xml
deleted file mode 100644
index 57de58924..000000000
--- a/res/menu/trim.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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:title="@string/done"
- android:enabled="true"
- android:showAsAction="ifRoom" />
-</menu>