diff options
author | Evan Millar <emillar@google.com> | 2011-10-11 15:22:07 -0700 |
---|---|---|
committer | Evan Millar <emillar@google.com> | 2011-10-11 15:24:02 -0700 |
commit | 69e105dbd0d7693ac753dc5c15fa3def65cc31e4 (patch) | |
tree | d59c55cc8edb9fe46855a2159807f384efefa283 /res | |
parent | 73ad6a2afa0e66c0984ced0d91b5cc2b42dd0661 (diff) | |
download | Camera-69e105dbd0d7693ac753dc5c15fa3def65cc31e4.tar.gz |
More bg training polish.
Make training modal by placing a semi-transparent view behind the
message panel to prevent interaction with the rest of the camera UI.
Use the framework dialog asset as the background asset for the message
panel. Since this asset is not public I had to copy it into the Camera
package.
bug:5225962
Change-Id: Ief97f545c6c0bb3695a056481d5e6d56d44edf25
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/dialog_full_holo_dark.9.png | bin | 0 -> 1414 bytes | |||
-rw-r--r-- | res/drawable-mdpi/dialog_full_holo_dark.9.png | bin | 0 -> 882 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/dialog_full_holo_dark.9.png | bin | 0 -> 2159 bytes | |||
-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 |
6 files changed, 66 insertions, 38 deletions
diff --git a/res/drawable-hdpi/dialog_full_holo_dark.9.png b/res/drawable-hdpi/dialog_full_holo_dark.9.png Binary files differnew file mode 100644 index 00000000..79e56f52 --- /dev/null +++ b/res/drawable-hdpi/dialog_full_holo_dark.9.png diff --git a/res/drawable-mdpi/dialog_full_holo_dark.9.png b/res/drawable-mdpi/dialog_full_holo_dark.9.png Binary files differnew file mode 100644 index 00000000..fb3660ea --- /dev/null +++ b/res/drawable-mdpi/dialog_full_holo_dark.9.png diff --git a/res/drawable-xhdpi/dialog_full_holo_dark.9.png b/res/drawable-xhdpi/dialog_full_holo_dark.9.png Binary files differnew file mode 100644 index 00000000..f4970ad1 --- /dev/null +++ b/res/drawable-xhdpi/dialog_full_holo_dark.9.png diff --git a/res/layout/bg_replacement_training_message.xml b/res/layout/bg_replacement_training_message.xml new file mode 100644 index 00000000..ee0464ed --- /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 7b34e9c1..5e271696 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 c8c24c24..809c7a51 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> |