diff options
author | Doris Liu <tianliu@google.com> | 2013-06-13 17:20:31 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2013-06-18 10:16:55 -0700 |
commit | 9194ad576d53852039f7de823ce3e54232e680d6 (patch) | |
tree | 2e5a6ea71d7b64ed5c9a0d01d658fcbf65055760 /res | |
parent | cf55a94b8bba764df380e4e49fe7baaa03d72575 (diff) | |
download | android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.tar.gz android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.tar.bz2 android_packages_apps_Snap-9194ad576d53852039f7de823ce3e54232e680d6.zip |
Switch over to use new camera activity
Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/camera.xml | 4 | ||||
-rw-r--r-- | res/layout/camera_main.xml | 31 | ||||
-rw-r--r-- | res/layout/new_photo_module.xml | 44 | ||||
-rw-r--r-- | res/layout/new_video_module.xml | 53 | ||||
-rw-r--r-- | res/layout/photo_module.xml | 9 | ||||
-rw-r--r-- | res/layout/video_module.xml | 66 |
6 files changed, 40 insertions, 167 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index d91799038..9a3a01a86 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.NewCameraRootView +<com.android.camera.ui.CameraRootView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_app_root" android:layout_width="match_parent" android:layout_height="match_parent" > -</com.android.camera.ui.NewCameraRootView> +</com.android.camera.ui.CameraRootView> diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml deleted file mode 100644 index 99befc08a..000000000 --- a/res/layout/camera_main.xml +++ /dev/null @@ -1,31 +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.CameraRootView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <include layout="@layout/gl_root_group" /> - - <FrameLayout - android:id="@+id/camera_app_root" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - <include layout="@layout/camera_controls" /> - -</com.android.camera.ui.CameraRootView>
\ No newline at end of file diff --git a/res/layout/new_photo_module.xml b/res/layout/new_photo_module.xml deleted file mode 100644 index 70a7579b7..000000000 --- a/res/layout/new_photo_module.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- 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. - 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 both landscape and portrait - orientation. The purpose of having this layout is to eventually not manually - recreate views when the orientation changes, by migrating the views that do not - need to be recreated in onConfigurationChanged from old photo_module to this - layout. --> - -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center"> - <TextureView - android:id="@+id/preview_content" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - <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" /> - <include layout="@layout/camera_controls" - android:layout_gravity="center" - style="@style/CameraControls"/> -</merge>
\ No newline at end of file diff --git a/res/layout/new_video_module.xml b/res/layout/new_video_module.xml deleted file mode 100644 index 9eb3e84e2..000000000 --- a/res/layout/new_video_module.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- 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. - 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. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="match_parent" - android:layout_width="match_parent"> - <TextureView - android:id="@+id/preview_content" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - <FrameLayout android:id="@+id/preview_border" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - android:background="@drawable/ic_snapshot_border" /> - <com.android.camera.ui.RenderOverlay - android:id="@+id/render_overlay" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect" - style="@style/ViewfinderLabelLayout"> - <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" /> - </com.android.camera.ui.RotateLayout> - <ImageView android:id="@+id/review_image" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:visibility="gone" - android:background="@android:color/black"/> - <ImageView - android:id="@+id/btn_play" - style="@style/ReviewControlIcon" - android:layout_centerInParent="true" - android:src="@drawable/ic_gallery_play_big" - android:visibility="gone" - android:onClick="onReviewPlayClicked"/> - - <include layout="@layout/camera_controls" - android:layout_gravity="center" - style="@style/CameraControls"/> -</merge> diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index abf094e27..70a7579b7 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -24,8 +24,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"> - <include layout="@layout/count_down_to_capture"/> - + <TextureView + android:id="@+id/preview_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <ViewStub android:id="@+id/face_view_stub" android:inflatedId="@+id/face_view" android:layout="@layout/face_view" @@ -36,4 +38,7 @@ android:id="@+id/render_overlay" android:layout_width="match_parent" android:layout_height="match_parent" /> + <include layout="@layout/camera_controls" + android:layout_gravity="center" + style="@style/CameraControls"/> </merge>
\ No newline at end of file diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 790f3eb91..9eb3e84e2 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.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. @@ -15,43 +15,39 @@ --> <!-- 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" + <TextureView + android:id="@+id/preview_content" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <FrameLayout android:id="@+id/preview_border" android:layout_width="match_parent" - 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" - android:visibility="gone" - android:background="@drawable/ic_snapshot_border" /> - <com.android.camera.ui.RenderOverlay - android:id="@+id/render_overlay" + android:layout_height="match_parent" + android:visibility="gone" + android:background="@drawable/ic_snapshot_border" /> + <com.android.camera.ui.RenderOverlay + android:id="@+id/render_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect" + style="@style/ViewfinderLabelLayout"> + <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" /> + </com.android.camera.ui.RotateLayout> + <ImageView android:id="@+id/review_image" + android:layout_height="match_parent" android:layout_width="match_parent" - android:layout_height="match_parent" /> - <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect" - style="@style/ViewfinderLabelLayout"> - <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" /> - </com.android.camera.ui.RotateLayout> - <ImageView android:id="@+id/review_image" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:visibility="gone" - android:background="@android:color/black"/> - <ImageView - android:id="@+id/btn_play" - style="@style/ReviewControlIcon" - android:layout_centerInParent="true" - android:src="@drawable/ic_gallery_play_big" - android:visibility="gone" - android:onClick="onReviewPlayClicked"/> - </com.android.camera.PreviewFrameLayout> + android:visibility="gone" + android:background="@android:color/black"/> + <ImageView + android:id="@+id/btn_play" + style="@style/ReviewControlIcon" + android:layout_centerInParent="true" + android:src="@drawable/ic_gallery_play_big" + android:visibility="gone" + android:onClick="onReviewPlayClicked"/> + <include layout="@layout/camera_controls" + android:layout_gravity="center" + style="@style/CameraControls"/> </merge> |