summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2009-06-19 20:11:44 +0800
committerWu-cheng Li <wuchengli@google.com>2009-06-19 21:54:43 +0800
commit84f96469f8c54fcdc61b6e854cd478abc15c4f52 (patch)
tree62496e08b249acceaec4368483b9434c1bf9e09d /res/layout
parent46fc7aeec04021dfc2f4c947649888dbc7408f53 (diff)
downloadLegacyCamera-84f96469f8c54fcdc61b6e854cd478abc15c4f52.zip
LegacyCamera-84f96469f8c54fcdc61b6e854cd478abc15c4f52.tar.gz
LegacyCamera-84f96469f8c54fcdc61b6e854cd478abc15c4f52.tar.bz2
Fix attach video.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera_control.xml3
-rw-r--r--res/layout/video_camera.xml39
2 files changed, 41 insertions, 1 deletions
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index 792ad50..f1c73a5 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -34,7 +34,8 @@
android:focusable="false"
android:background="@drawable/border_last_picture"/>
- <LinearLayout android:orientation="vertical"
+ <LinearLayout android:id="@+id/camera_switch_set"
+ android:orientation="vertical"
android:layout_centerInParent="true"
android:layout_height="wrap_content"
android:layout_width="wrap_content">
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 0e27b01..1ab2e80 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -34,6 +34,12 @@
android:layout_width="352dp"
android:layout_height="288dp"
android:layout_centerInParent="true" />
+ <ImageView
+ android:id="@+id/video_frame"
+ android:layout_width="352dp"
+ android:layout_height="288dp"
+ android:layout_toLeftOf="@id/button_bar"
+ android:visibility="gone" />
</FrameLayout>
<!-- Note: In this TextView the paddingRight="2"
@@ -59,4 +65,37 @@
android:textSize="23dp"
android:textStyle="bold"
android:visibility="gone"/>
+
+
+ <LinearLayout
+ android:visibility="gone"
+ android:id="@+id/post_picture_panel"
+ android:layout_alignParentTop="true"
+ android:layout_toLeftOf="@id/button_bar"
+ android:layout_marginTop="20dp"
+ android:layout_marginRight="30dp"
+ android:layout_marginLeft="30dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <com.android.camera.ActionMenuButton
+ android:id="@+id/play"
+ android:drawableTop="@drawable/ic_menu_camera_play"
+ android:text="@string/camera_play"
+ style="@style/OnscreenActionIcon"
+ />
+ <com.android.camera.ActionMenuButton
+ android:id="@+id/attach"
+ android:drawableTop="@drawable/ic_menu_attach"
+ android:text="@string/camera_attach"
+ style="@style/OnscreenActionIcon"
+ />
+ <com.android.camera.ActionMenuButton
+ android:id="@+id/cancel"
+ android:drawableTop="@drawable/ic_menu_cancel"
+ android:text="@string/camera_cancel"
+ style="@style/OnscreenActionIcon"
+ />
+ </LinearLayout>
</RelativeLayout>