diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/attach_camera_control.xml | 82 | ||||
| -rw-r--r-- | res/layout/camera_attach.xml | 26 | ||||
| -rw-r--r-- | res/layout/camera_control.xml | 28 | ||||
| -rw-r--r-- | res/layout/focus_indicator.xml (renamed from res/layout/focus_rect.xml) | 4 | ||||
| -rw-r--r-- | res/layout/pano_capture.xml | 14 | ||||
| -rw-r--r-- | res/layout/pano_review.xml | 15 | ||||
| -rw-r--r-- | res/layout/preview_frame.xml | 2 | ||||
| -rw-r--r-- | res/layout/preview_frame_video.xml | 13 | ||||
| -rw-r--r-- | res/layout/video_camera_attach.xml | 26 |
9 files changed, 54 insertions, 156 deletions
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml deleted file mode 100644 index f97b908..0000000 --- a/res/layout/attach_camera_control.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2009 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. ---> - -<com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" - android:id="@+id/control_panel" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:minWidth="76dp" - android:paddingTop="13dp" - android:paddingBottom="3dp" - android:background="@drawable/bg_camera_pattern"> - <LinearLayout android:orientation="vertical" - android:id="@+id/review_control" - android:gravity="top|center_horizontal" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_height="wrap_content" - android:layout_width="match_parent"> - <LinearLayout style="@style/ReviewControlGroup" - android:layout_marginBottom="15dp"> - <ImageView style="@style/ReviewControlIcon" - android:id="@+id/btn_cancel" - android:onClick="onCancelButtonClicked" - android:src="@drawable/btn_ic_review_cancel"/> - <TextView style="@style/ReviewControlText" - android:text="@string/review_cancel" /> - </LinearLayout> - <LinearLayout style="@style/ReviewControlGroup" - android:visibility="gone" - android:layout_marginBottom="15dp"> - <ImageView style="@style/ReviewControlIcon" - android:id="@+id/btn_retake" - android:onClick="onRetakeButtonClicked" - android:src="@drawable/btn_ic_review_retake_photo"/> - <TextView style="@style/ReviewControlText" - android:text="@string/review_retake" /> - </LinearLayout> - <LinearLayout style="@style/ReviewControlGroup" - android:visibility="gone" - android:layout_marginBottom="15dp"> - <ImageView style="@style/ReviewControlIcon" - android:id="@+id/btn_play" - android:onClick="onPlayButtonClicked" - android:src="@drawable/btn_ic_review_play"/> - <TextView style="@style/ReviewControlText" - android:text="@string/review_play" /> - </LinearLayout> - </LinearLayout> - - <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:clickable="true" - android:focusable="true" - android:background="@drawable/btn_shutter"/> - <LinearLayout style="@style/ReviewControlGroup" - android:visibility="invisible" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true"> - <ImageView style="@style/ReviewControlIcon" - android:id="@+id/btn_done" - android:onClick="onDoneButtonClicked" - android:src="@drawable/btn_ic_review_done"/> - <TextView style="@style/ReviewControlText" - android:text="@string/review_ok" /> - </LinearLayout> -</com.android.camera.ui.ControlPanelLayout> diff --git a/res/layout/camera_attach.xml b/res/layout/camera_attach.xml deleted file mode 100644 index 9145e4b..0000000 --- a/res/layout/camera_attach.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" - android:id="@+id/app_root" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/preview_frame"/> - <include layout="@layout/attach_camera_control"/> -</LinearLayout> diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index 801b173..54f46c5 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -22,7 +22,14 @@ android:background="@drawable/bg_camera_pattern"> <include layout="@layout/review_thumbnail"/> - + <ImageButton android:id="@+id/btn_done" + style="@style/ReviewControlIcon" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginTop="10dp" + android:src="@drawable/ic_menu_done_holo_light" + android:visibility="gone" + android:onClick="onDoneButtonClicked"/> <com.android.camera.ShutterButton android:id="@+id/shutter_button" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -33,5 +40,22 @@ android:background="@drawable/btn_shutter"/> <include layout="@layout/mode_picker"/> - + <LinearLayout + android:orientation="vertical" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_marginBottom="10dp"> + <Button android:id="@+id/btn_retake" + android:text="@string/review_retake" + style="@style/ReviewControlIcon" + android:visibility="gone" + android:onClick="onRetakeButtonClicked" /> + <Button android:id="@+id/btn_cancel" + android:text="@string/review_cancel" + style="@style/ReviewControlIcon" + android:visibility="gone" + android:onClick="onCancelButtonClicked" /> + </LinearLayout> </com.android.camera.ui.ControlPanelLayout> diff --git a/res/layout/focus_rect.xml b/res/layout/focus_indicator.xml index f8aef7c..0e67061 100644 --- a/res/layout/focus_rect.xml +++ b/res/layout/focus_indicator.xml @@ -15,11 +15,11 @@ --> <com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/focus_rect_rotate_layout" + android:id="@+id/focus_indicator_rotate_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true"> - <com.android.camera.ui.FocusRectangle android:id="@+id/focus_rect" + <com.android.camera.ui.FocusIndicatorView android:id="@+id/focus_indicator" android:layout_width="120dp" android:layout_height="120dp"/> </com.android.camera.ui.RotateLayout> diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml index 1ba0196..67d302d 100644 --- a/res/layout/pano_capture.xml +++ b/res/layout/pano_capture.xml @@ -17,7 +17,6 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pano_capture_layout" android:visibility="visible" - android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -29,11 +28,6 @@ android:layout_gravity="center" android:layout_width="@dimen/pano_mosaic_surface_width" android:layout_height="@dimen/pano_mosaic_surface_height" /> - <com.android.camera.panorama.CaptureView - android:id="@+id/pano_capture_view" - android:visibility="gone" - android:layout_width="match_parent" - android:layout_height="match_parent" /> </FrameLayout> <ImageView style="@style/PanoViewHorizontalGrayBar" @@ -57,6 +51,14 @@ android:layout_height="@dimen/pano_capture_stop_button_width" /> </LinearLayout> + <com.android.camera.panorama.IndicationView + android:id="@+id/pano_capture_view" + android:visibility="gone" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" + android:layout_width="@dimen/pano_indication_width" + android:layout_height="@dimen/pano_indication_height" /> + <include layout="@layout/pano_control" android:id="@+id/pano_control_layout" /> <TextView android:id="@+id/pano_capture_too_fast_textview" diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml index 07bc15d..0478580 100644 --- a/res/layout/pano_review.xml +++ b/res/layout/pano_review.xml @@ -14,21 +14,20 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pano_review_layout" android:visibility="invisible" android:orientation="vertical" - android:gravity="fill_horizontal" android:layout_width="match_parent" android:layout_height="match_parent"> + <View style="@style/PanoViewHorizontalGrayBar"/> + <ImageView android:id="@+id/pano_reviewarea" - android:scaleType="center" + android:scaleType="fitCenter" android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <View style="@style/PanoViewHorizontalGrayBar" - android:layout_alignParentTop="true" /> + android:layout_height="0dp" + android:layout_weight="1" /> <LinearLayout android:id="@+id/pano_review_control" style="@style/PanoViewHorizontalGrayBar" @@ -52,4 +51,4 @@ android:layout_width="wrap_content" android:layout_height="@dimen/pano_review_button_height" /> </LinearLayout> -</RelativeLayout> +</LinearLayout> diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml index b1deb86..e8afb12 100644 --- a/res/layout/preview_frame.xml +++ b/res/layout/preview_frame.xml @@ -35,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone"/> - <include layout="@layout/focus_rect"/> + <include layout="@layout/focus_indicator"/> <include layout="@layout/priority_indicators"/> <include layout="@layout/tap_to_focus_toast"/> <include layout="@layout/indicator_bar" /> diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index abfd026..baabe0a 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + <com.android.camera.PreviewFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/frame_layout" android:layout_width="match_parent" @@ -43,12 +44,18 @@ android:layout_marginBottom="13dp" android:layout_marginLeft="17dp" android:paddingRight="2dp" - android:visibility="gone" /> + android:visibility="gone"/> + <ImageButton android:id="@+id/btn_play" + style="@style/ReviewControlIcon" + android:layout_centerInParent="true" + android:src="@drawable/btn_ic_review_play" + android:visibility="gone" + android:onClick="onPlayButtonClicked"/> <ImageView android:id="@+id/review_image" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" - android:background="@android:color/black" /> - <include layout="@layout/indicator_bar" /> + android:background="@android:color/black"/> + <include layout="@layout/indicator_bar"/> </RelativeLayout> </com.android.camera.PreviewFrameLayout> diff --git a/res/layout/video_camera_attach.xml b/res/layout/video_camera_attach.xml deleted file mode 100644 index c526ca8..0000000 --- a/res/layout/video_camera_attach.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" - android:id="@+id/app_root" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <include layout="@layout/preview_frame_video"/> - <include layout="@layout/attach_camera_control"/> -</LinearLayout> |