diff options
author | Doris Liu <tianliu@google.com> | 2013-04-26 17:06:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-26 17:06:19 +0000 |
commit | 877482335f89da699d0c986e585e489dc7f2d7d9 (patch) | |
tree | 69be5ad93eae7077f8e5f16fd67d4114f10ad5f7 /res | |
parent | f385c107c35225d2ad4181eeaa18860bb480f1ce (diff) | |
parent | 020026d033db02ffb47d2ae73c7f54e72a315107 (diff) | |
download | android_packages_apps_Snap-877482335f89da699d0c986e585e489dc7f2d7d9.tar.gz android_packages_apps_Snap-877482335f89da699d0c986e585e489dc7f2d7d9.tar.bz2 android_packages_apps_Snap-877482335f89da699d0c986e585e489dc7f2d7d9.zip |
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
Diffstat (limited to 'res')
-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, 0 insertions, 144 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml deleted file mode 100644 index b4ec436c6..000000000 --- a/res/layout/camera.xml +++ /dev/null @@ -1,27 +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. ---> -<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 deleted file mode 100644 index 26fc3f030..000000000 --- a/res/layout/camera_filmstrip.xml +++ /dev/null @@ -1,20 +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. ---> -<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 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> |