diff options
Diffstat (limited to 'res/layout/video_camera.xml')
| -rw-r--r-- | res/layout/video_camera.xml | 91 |
1 files changed, 40 insertions, 51 deletions
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index 678869e..b165d90 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -20,58 +20,47 @@ android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent"> - - <RelativeLayout android:layout_width="0px" + <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout" + android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1"> - <LinearLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:gravity="center_vertical" - android:orientation="horizontal"> - <ImageView android:id="@+id/btn_gripper" - android:layout_marginRight="1dp" - android:background="@drawable/btn_gripper" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true"/> - <FrameLayout android:layout_width="wrap_content" + <ImageView android:id="@+id/btn_gripper" + android:background="@drawable/btn_gripper" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + <FrameLayout android:id="@+id/frame" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@drawable/border_view_finder"> + <SurfaceView android:id="@+id/camera_preview" + android:layout_width="fill_parent" + android:layout_height="fill_parent"/> + <ImageView + android:id="@+id/video_frame" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:visibility="gone" /> + <!-- Note: In this TextView the paddingRight="2" + attribute is required because otherwise the + text's drop shadow will be clipped. --> + <TextView android:id="@+id/recording_time" + android:layout_width="180dp" android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:background="@drawable/border_view_finder"> - <com.android.camera.VideoPreview - android:id="@+id/camera_preview" - android:layout_width="352dp" - android:layout_height="288dp"/> - <ImageView - android:id="@+id/video_frame" - android:layout_width="352dp" - android:layout_height="288dp" - android:visibility="gone" /> - <!-- Note: In this TextView the paddingRight="2" - attribute is required because otherwise the - text's drop shadow will be clipped. --> - <TextView - android:id="@+id/recording_time" - android:layout_width="180dp" - android:layout_height="wrap_content" - android:layout_gravity="left|bottom" - android:layout_marginBottom="13dp" - android:layout_marginLeft="17dp" - android:paddingRight="2dp" - android:drawablePadding="8dp" - android:drawableLeft="@drawable/ic_recording_indicator" - android:shadowColor="#c0000000" - android:shadowDx="1" - android:shadowDy="1" - android:shadowRadius="1" - android:gravity="left|center_vertical" - android:textColor="@color/recording_time_elapsed_text" - android:textSize="23dp" - android:textStyle="bold" - android:visibility="gone"/> - </FrameLayout> - </LinearLayout> - </RelativeLayout> + android:layout_gravity="left|bottom" + android:layout_marginBottom="13dp" + android:layout_marginLeft="17dp" + android:paddingRight="2dp" + android:drawablePadding="8dp" + android:drawableLeft="@drawable/ic_recording_indicator" + android:shadowColor="#c0000000" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="1" + android:gravity="left|center_vertical" + android:textColor="@color/recording_time_elapsed_text" + android:textSize="23dp" + android:textStyle="bold" + android:visibility="gone"/> + </FrameLayout> + </com.android.camera.PreviewFrameLayout> </LinearLayout> |