diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/bg_replacement_training_message.xml | 56 | ||||
| -rw-r--r-- | res/layout/preview_frame_video.xml | 33 | ||||
| -rw-r--r-- | res/layout/video_camera.xml | 15 |
3 files changed, 66 insertions, 38 deletions
diff --git a/res/layout/bg_replacement_training_message.xml b/res/layout/bg_replacement_training_message.xml new file mode 100644 index 0000000..ee0464e --- /dev/null +++ b/res/layout/bg_replacement_training_message.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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/bg_replace_message_frame" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + android:onClick="onProtectiveCurtainClick" + android:background="#77000000"> + <com.android.camera.ui.RotateLayout + android:id="@+id/bg_replace_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true"> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="@drawable/dialog_full_holo_dark"> + <TextView + android:layout_width="300dp" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/bg_replacement_message" + android:padding="32dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1px" + android:background="#aaaaaa" /> + + <Button android:id="@+id/bg_replace_cancel_button" + android:layout_width="match_parent" + android:layout_height="48dip" + android:layout_gravity="center" + android:textAppearance="?android:attr/textAppearanceMedium" + style="?android:attr/borderlessButtonStyle" + android:text="@android:string/cancel" + android:onClick="onCancelBgTraining"/> + </LinearLayout> + </com.android.camera.ui.RotateLayout> +</RelativeLayout> diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index 7b34e9c..5e27169 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -44,39 +44,6 @@ android:src="@drawable/ic_gallery_play" android:visibility="gone" android:onClick="onReviewPlayClicked"/> - <com.android.camera.ui.RotateLayout android:id="@+id/bg_replace_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:visibility="gone" - android:layout_margin="24dp" > - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@drawable/bg_text_on_preview"> - <TextView - android:layout_width="300dp" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/bg_replacement_message" - android:padding="32dp" /> - - <View - android:layout_width="match_parent" - android:layout_height="1px" - android:background="#aaaaaa" /> - - <Button android:id="@+id/bg_replace_cancel_button" - android:layout_width="match_parent" - android:layout_height="48dip" - android:layout_gravity="center" - android:textAppearance="?android:attr/textAppearanceMedium" - style="?android:attr/borderlessButtonStyle" - android:text="@android:string/cancel" - android:onClick="onCancelBgTraining"/> - </LinearLayout> - </com.android.camera.ui.RotateLayout> </com.android.camera.PreviewFrameLayout> <!-- Fill up the space below preview frame with black. --> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index c8c24c2..809c7a5 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -14,12 +14,17 @@ limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout 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/camera_control"/> -</LinearLayout> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <include layout="@layout/preview_frame_video"/> + <include layout="@layout/camera_control"/> + </LinearLayout> + <include layout="@layout/bg_replacement_training_message"/> +</RelativeLayout> |