diff options
author | Doris Liu <tianliu@google.com> | 2013-03-04 18:36:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-04 18:36:37 +0000 |
commit | 5bb5fea402f0d584cacf237bfb7be53cf06e6489 (patch) | |
tree | 2dae1dff7eb75dae6c6a9c3aef42ea6488c7d588 /res | |
parent | 2a025ee773a4c40b05de6c70a4681abdb4e243bd (diff) | |
parent | 08a98b9946503e97549d70fd0228dea81175159e (diff) | |
download | android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.tar.gz android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.tar.bz2 android_packages_apps_Snap-5bb5fea402f0d584cacf237bfb7be53cf06e6489.zip |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
Diffstat (limited to 'res')
18 files changed, 119 insertions, 343 deletions
diff --git a/res/layout-land/photo_module_content.xml b/res/layout-land/camera_controls.xml index d734f8329..a909c5132 100644 --- a/res/layout-land/photo_module_content.xml +++ b/res/layout-land/camera_controls.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -13,16 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- This layout is shared by phone and tablet in landscape orientation. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app" + android:id="@+id/camera_controls" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" > - <include layout="@layout/preview_module_frame"/> - - <FrameLayout + <com.android.camera.ui.RotatableLayout style="@style/CameraControls" + android:id="@+id/menu_button" android:layout_gravity="center" > <View @@ -40,17 +38,36 @@ android:layout_marginRight="-2dip" android:layout_gravity="top|right"/> - - <include layout="@layout/review_module_control" - android:layout_marginRight="2dip" /> - <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" android:layout_gravity="right|top" android:layout_marginRight="2dip" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + style="@style/CameraControls" + android:id="@+id/switcher_control" + android:layout_gravity="right|center_horizontal" > + <com.android.camera.ui.CameraSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="right|bottom" + android:layout_marginRight="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + </com.android.camera.ui.RotatableLayout> - </FrameLayout> + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + android:layout_marginRight="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> -</FrameLayout> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-land/camera_shutter_switcher.xml b/res/layout-land/camera_shutter_switcher.xml deleted file mode 100644 index 9c06749c7..000000000 --- a/res/layout-land/camera_shutter_switcher.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?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/camera_shutter_switcher" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View - android:id="@+id/controls" - style="@style/CameraControls" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" /> - - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_marginRight="@dimen/shutter_offset" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> - - <com.android.camera.ui.CameraSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_alignBottom="@id/controls" - android:layout_alignParentRight="true" - android:layout_marginRight="2dip" - android:contentDescription="@string/accessibility_mode_picker" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-land/pano_module_capture.xml b/res/layout-land/pano_module_capture.xml index 6cad0bf37..26cbfb1ec 100644 --- a/res/layout-land/pano_module_capture.xml +++ b/res/layout-land/pano_module_capture.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" + android:id="@+id/camera_app" android:layout_height="match_parent" android:layout_width="match_parent" android:layout_gravity="center" diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml index e732a2c80..9f8b0cd46 100644 --- a/res/layout-land/review_module_control.xml +++ b/res/layout-land/review_module_control.xml @@ -13,13 +13,16 @@ 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_height="match_parent" - android:layout_width="match_parent"> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_done" +<com.android.camera.ui.RotatableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CameraControls" + android:layout_gravity="right|center_vertical" + android:layout_marginRight="2dip"> + <ImageView android:id="@+id/btn_done" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" + android:scaleType="center" android:layout_gravity="top|right" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_done_holo_light" /> @@ -34,11 +37,12 @@ android:background="@drawable/bg_pressed" android:src="@drawable/ic_btn_shutter_retake" /> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" + <ImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" + android:scaleType="center" android:layout_gravity="bottom|right" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_cancel_holo_light" /> -</FrameLayout> +</com.android.camera.ui.RotatableLayout> diff --git a/res/layout-land/switcher_popup.xml b/res/layout-land/switcher_popup.xml index b949f9633..fc2d7bc77 100644 --- a/res/layout-land/switcher_popup.xml +++ b/res/layout-land/switcher_popup.xml @@ -18,8 +18,7 @@ android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignBottom="@id/camera_switcher" - android:layout_alignRight="@id/camera_switcher" + android:layout_gravity="bottom|right" android:layout_marginRight="8dip" android:layout_marginBottom="8dip" android:paddingLeft="8dip" diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml deleted file mode 100644 index 972a7f901..000000000 --- a/res/layout-land/video_module.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?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. ---> -<!-- This layout is shared by phone and tablet in landscape orientation. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" - android:layout_height="match_parent" - android:layout_width="match_parent"> - <include layout="@layout/preview_module_frame_video"/> - - <RelativeLayout - style="@style/CameraControls" - android:layout_centerVertical="true" > - - <View - android:id="@+id/blocker" - android:layout_width="@dimen/switcher_size" - android:layout_height="match_parent" - android:background="@drawable/switcher_bg" - android:layout_alignParentRight="true" - android:clickable="true" /> - - <include layout="@layout/menu_indicators" - android:layout_width="80dip" - android:layout_height="80dip" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_marginRight="-2dip" - android:layout_marginTop="-5dip" /> - - <include layout="@layout/bg_replacement_training_message" /> - - <include layout="@layout/review_module_control" - android:layout_marginRight="2dip" /> - - <com.android.camera.ui.PieMenuButton - android:id="@+id/menu" - style="@style/SwitcherButton" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_marginRight="2dip" - android:contentDescription="@string/accessibility_menu_button" /> - - </RelativeLayout> - -</RelativeLayout> diff --git a/res/layout-port/photo_module_content.xml b/res/layout-port/camera_controls.xml index a82a7a138..caad86860 100644 --- a/res/layout-port/photo_module_content.xml +++ b/res/layout-port/camera_controls.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project +<!-- Copyright (C) 2013 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. @@ -13,16 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<!-- This layout is shared by phone and tablet in landscape orientation. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app" + android:id="@+id/camera_controls" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" > - <include layout="@layout/preview_module_frame"/> - - <FrameLayout + <com.android.camera.ui.RotatableLayout style="@style/CameraControls" + android:id="@+id/menu_button" android:layout_gravity="center" > <View @@ -40,9 +38,6 @@ android:layout_marginBottom="-2dip" android:layout_marginRight="-5dip" /> - <include layout="@layout/review_module_control" - android:layout_marginBottom="2dip" /> - <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" @@ -50,6 +45,31 @@ android:layout_marginBottom="2dip" android:contentDescription="@string/accessibility_menu_button" /> - </FrameLayout> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ui.RotatableLayout + style="@style/CameraControls" + android:id="@+id/switcher_control" + android:layout_gravity="bottom|center_horizontal"> + + <com.android.camera.ui.CameraSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="bottom|left" + android:layout_marginBottom="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + </com.android.camera.ui.RotatableLayout> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> -</FrameLayout> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-port/camera_shutter_switcher.xml b/res/layout-port/camera_shutter_switcher.xml deleted file mode 100644 index db73fb080..000000000 --- a/res/layout-port/camera_shutter_switcher.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?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/camera_shutter_switcher" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <View - android:id="@+id/controls" - style="@style/CameraControls" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" /> - - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_marginBottom="@dimen/shutter_offset" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> - - <com.android.camera.ui.CameraSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_alignParentBottom="true" - android:layout_alignLeft="@id/controls" - android:layout_marginBottom="2dip" - android:contentDescription="@string/accessibility_mode_picker" /> -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml index 762447e77..d9c9877a2 100644 --- a/res/layout-port/pano_module_capture.xml +++ b/res/layout-port/pano_module_capture.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" + android:id="@+id/camera_app" android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="vertical"> diff --git a/res/layout-port/review_module_control.xml b/res/layout-port/review_module_control.xml index 549775430..3c4280ed2 100644 --- a/res/layout-port/review_module_control.xml +++ b/res/layout-port/review_module_control.xml @@ -13,13 +13,16 @@ 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_height="match_parent" - android:layout_width="match_parent"> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_done" +<com.android.camera.ui.RotatableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/CameraControls" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="2dip"> + <ImageView android:id="@+id/btn_done" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" + android:scaleType="center" android:layout_gravity="right|bottom" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_done_holo_light" /> @@ -34,11 +37,12 @@ android:background="@drawable/bg_pressed" android:src="@drawable/ic_btn_shutter_retake" /> - <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" + <ImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" + android:scaleType="center" android:layout_gravity="left|bottom" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_cancel_holo_light" /> -</FrameLayout> +</com.android.camera.ui.RotatableLayout> diff --git a/res/layout-port/switcher_popup.xml b/res/layout-port/switcher_popup.xml index b1481a347..8fe09a361 100644 --- a/res/layout-port/switcher_popup.xml +++ b/res/layout-port/switcher_popup.xml @@ -18,8 +18,7 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignBottom="@id/camera_switcher" - android:layout_alignLeft="@id/camera_switcher" + android:layout_gravity="bottom|left" android:layout_marginLeft="8dip" android:layout_marginBottom="8dip" android:paddingLeft="16dip" diff --git a/res/layout-port/video_module.xml b/res/layout-port/video_module.xml deleted file mode 100644 index d8a6490d4..000000000 --- a/res/layout-port/video_module.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?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. ---> -<!-- This layout is shared by phone and tablet in landscape orientation. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" - android:layout_height="match_parent" - android:layout_width="match_parent"> - <include layout="@layout/preview_module_frame_video"/> - - <RelativeLayout - style="@style/CameraControls" - android:layout_centerHorizontal="true" > - - <View - android:id="@+id/blocker" - android:layout_width="match_parent" - android:layout_height="@dimen/switcher_size" - android:background="@drawable/switcher_bg" - android:clickable="true" - android:layout_alignParentBottom="true" /> - - <include layout="@layout/menu_indicators" - android:layout_width="80dip" - android:layout_height="80dip" - android:layout_marginRight="-5dip" - android:layout_marginBottom="-2dip" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" /> - - <include layout="@layout/bg_replacement_training_message"/> - - <include layout="@layout/review_module_control" - android:layout_marginBottom="2dip" /> - - <com.android.camera.ui.PieMenuButton - android:id="@+id/menu" - style="@style/SwitcherButton" - android:contentDescription="@string/accessibility_menu_button" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_marginBottom="2dip" /> - - </RelativeLayout> - -</RelativeLayout> diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml index f5240feed..657c06c1a 100644 --- a/res/layout/camera_main.xml +++ b/res/layout/camera_main.xml @@ -21,10 +21,10 @@ <include layout="@layout/gl_root_group" /> <FrameLayout - android:id="@+id/main_content" + android:id="@+id/camera_app_root" android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/camera_shutter_switcher" /> + <include layout="@layout/camera_controls" /> </RelativeLayout>
\ No newline at end of file diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml index 901bb6b7a..9ecbd07f7 100644 --- a/res/layout/panorama_module.xml +++ b/res/layout/panorama_module.xml @@ -14,10 +14,10 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<merge xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pano_layout" android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/pano_module_capture" /> <include layout="@layout/pano_review" /> -</RelativeLayout> +</merge> diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index b2ad7028f..abf094e27 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -20,10 +20,20 @@ need to be recreated in onConfigurationChanged from old photo_module to this layout. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" +<merge xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:layout_gravity="center"> <include layout="@layout/count_down_to_capture"/> - <include layout="@layout/photo_module_content"/> -</FrameLayout>
\ No newline at end of file + + <ViewStub android:id="@+id/face_view_stub" + android:inflatedId="@+id/face_view" + android:layout="@layout/face_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"/> + <com.android.camera.ui.RenderOverlay + android:id="@+id/render_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</merge>
\ No newline at end of file diff --git a/res/layout/preview_module_frame.xml b/res/layout/preview_module_frame.xml deleted file mode 100644 index 66094c9b7..000000000 --- a/res/layout/preview_module_frame.xml +++ /dev/null @@ -1,43 +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. ---> - -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/frame_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1"> - <com.android.camera.PreviewFrameLayout android:id="@+id/frame" - android:layout_centerInParent="true" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <include layout="@layout/preview_surface_view"/> - <ViewStub android:id="@+id/face_view_stub" - android:inflatedId="@+id/face_view" - android:layout="@layout/face_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone"/> - <com.android.camera.ui.RenderOverlay - android:id="@+id/render_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </com.android.camera.PreviewFrameLayout> - <ImageView android:id="@+id/capture_anim_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layerType="hardware" - android:visibility="gone"/> -</RelativeLayout> diff --git a/res/layout/preview_surface_view.xml b/res/layout/preview_surface_view.xml deleted file mode 100644 index cdaf0eea9..000000000 --- a/res/layout/preview_surface_view.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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. ---> -<com.android.camera.ui.PreviewSurfaceView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/preview_surface_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone"/> diff --git a/res/layout/preview_module_frame_video.xml b/res/layout/video_module.xml index 3418faf19..790f3eb91 100644 --- a/res/layout/preview_module_frame_video.xml +++ b/res/layout/video_module.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 The Android Open Source Project +<!-- 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. @@ -13,16 +13,20 @@ 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/frame_layout" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_weight="1"> +<!-- This layout is shared by phone and tablet in landscape orientation. --> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_app_root" + android:layout_height="match_parent" + android:layout_width="match_parent"> <com.android.camera.PreviewFrameLayout android:id="@+id/frame" android:layout_height="match_parent" android:layout_width="match_parent" - android:layout_centerInParent="true"> - <include layout="@layout/preview_surface_view"/> + android:layout_gravity="center"> + <com.android.camera.ui.PreviewSurfaceView + android:id="@+id/preview_surface_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"/> <FrameLayout android:id="@+id/preview_border" android:layout_width="match_parent" android:layout_height="match_parent" @@ -41,7 +45,7 @@ android:layout_width="match_parent" android:visibility="gone" android:background="@android:color/black"/> - <com.android.camera.ui.RotateImageView + <ImageView android:id="@+id/btn_play" style="@style/ReviewControlIcon" android:layout_centerInParent="true" @@ -50,11 +54,4 @@ android:onClick="onReviewPlayClicked"/> </com.android.camera.PreviewFrameLayout> - <ImageView android:id="@+id/capture_anim_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layerType="hardware" - android:visibility="gone"/> - -</RelativeLayout> - +</merge> |