diff options
author | Doris Liu <tianliu@google.com> | 2013-05-16 23:54:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-16 23:54:29 +0000 |
commit | 76f7dddd28e1837b3d59d22b98a81c73a6bce75e (patch) | |
tree | 3d24c1439ca41413cfeac107b3901a02b74f7704 /res/layout | |
parent | cf2a4a0d300e4d064e5742d32fe07e9374c27065 (diff) | |
parent | 76046e5ca00c71aed9838dc1c33afc3c4e66997f (diff) | |
download | android_packages_apps_Snap-76f7dddd28e1837b3d59d22b98a81c73a6bce75e.tar.gz android_packages_apps_Snap-76f7dddd28e1837b3d59d22b98a81c73a6bce75e.tar.bz2 android_packages_apps_Snap-76f7dddd28e1837b3d59d22b98a81c73a6bce75e.zip |
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/camera.xml | 27 | ||||
-rw-r--r-- | res/layout/camera_filmstrip.xml | 20 | ||||
-rw-r--r-- | res/layout/new_photo_module.xml | 44 | ||||
-rw-r--r-- | res/layout/new_video_module.xml | 53 |
4 files changed, 144 insertions, 0 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml new file mode 100644 index 000000000..b4ec436c6 --- /dev/null +++ b/res/layout/camera.xml @@ -0,0 +1,27 @@ +<?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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + <!-- NewCameraRootView needs to be in a FrameLayout to set margins + in the layout parameters. --> + <com.android.camera.ui.NewCameraRootView + 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> +</FrameLayout> diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml new file mode 100644 index 000000000..26fc3f030 --- /dev/null +++ b/res/layout/camera_filmstrip.xml @@ -0,0 +1,20 @@ +<?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. +--> +<com.android.camera.ui.FilmStripView +xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/filmstrip_view" + android:layout_width="match_parent" + android:layout_height="match_parent" /> diff --git a/res/layout/new_photo_module.xml b/res/layout/new_photo_module.xml new file mode 100644 index 000000000..70a7579b7 --- /dev/null +++ b/res/layout/new_photo_module.xml @@ -0,0 +1,44 @@ +<?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 new file mode 100644 index 000000000..9eb3e84e2 --- /dev/null +++ b/res/layout/new_video_module.xml @@ -0,0 +1,53 @@ +<?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> |