diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/toast_frame_holo.9.png | bin | 0 -> 1585 bytes | |||
-rw-r--r-- | res/drawable-mdpi/toast_frame_holo.9.png | bin | 0 -> 1585 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/toast_frame_holo.9.png | bin | 0 -> 1585 bytes | |||
-rw-r--r-- | res/layout-sw600dp/pano_capture.xml | 3 | ||||
-rw-r--r-- | res/layout-sw600dp/preview_frame.xml | 1 | ||||
-rw-r--r-- | res/layout-sw600dp/preview_frame_video.xml | 1 | ||||
-rw-r--r-- | res/layout/first_hint_toast.xml | 35 | ||||
-rw-r--r-- | res/layout/pano_capture.xml | 3 | ||||
-rw-r--r-- | res/layout/pano_review.xml | 14 | ||||
-rw-r--r-- | res/layout/preview_frame.xml | 1 | ||||
-rw-r--r-- | res/layout/preview_frame_video.xml | 1 | ||||
-rw-r--r-- | res/layout/rotate_text_toast.xml | 39 |
12 files changed, 52 insertions, 46 deletions
diff --git a/res/drawable-hdpi/toast_frame_holo.9.png b/res/drawable-hdpi/toast_frame_holo.9.png Binary files differnew file mode 100644 index 0000000..f8f75db --- /dev/null +++ b/res/drawable-hdpi/toast_frame_holo.9.png diff --git a/res/drawable-mdpi/toast_frame_holo.9.png b/res/drawable-mdpi/toast_frame_holo.9.png Binary files differnew file mode 100644 index 0000000..f8f75db --- /dev/null +++ b/res/drawable-mdpi/toast_frame_holo.9.png diff --git a/res/drawable-xhdpi/toast_frame_holo.9.png b/res/drawable-xhdpi/toast_frame_holo.9.png Binary files differnew file mode 100644 index 0000000..f8f75db --- /dev/null +++ b/res/drawable-xhdpi/toast_frame_holo.9.png diff --git a/res/layout-sw600dp/pano_capture.xml b/res/layout-sw600dp/pano_capture.xml index 2f58b10..1b2900b 100644 --- a/res/layout-sw600dp/pano_capture.xml +++ b/res/layout-sw600dp/pano_capture.xml @@ -55,8 +55,9 @@ <RelativeLayout android:layout_gravity="center" + android:layout_weight="1.67" android:layout_width="match_parent" - android:layout_height="@dimen/pano_mosaic_surface_height"> + android:layout_height="0dp"> <com.android.camera.panorama.MosaicRendererSurfaceView android:id="@+id/pano_renderer" android:layout_width="match_parent" diff --git a/res/layout-sw600dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml index 896d394..1316f4a 100644 --- a/res/layout-sw600dp/preview_frame.xml +++ b/res/layout-sw600dp/preview_frame.xml @@ -31,6 +31,5 @@ android:visibility="gone"/> <include layout="@layout/focus_indicator"/> <include layout="@layout/priority_indicators"/> - <include layout="@layout/first_hint_toast"/> </com.android.camera.PreviewFrameLayout> </RelativeLayout> diff --git a/res/layout-sw600dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml index aab1ee1..1108814 100644 --- a/res/layout-sw600dp/preview_frame_video.xml +++ b/res/layout-sw600dp/preview_frame_video.xml @@ -48,6 +48,5 @@ android:background="@drawable/bg_pressed" android:visibility="gone" android:onClick="onReviewPlayClicked" /> - <include layout="@layout/first_hint_toast"/> </com.android.camera.PreviewFrameLayout> </RelativeLayout> diff --git a/res/layout/first_hint_toast.xml b/res/layout/first_hint_toast.xml deleted file mode 100644 index fb60d29..0000000 --- a/res/layout/first_hint_toast.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 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. -*/ ---> -<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/first_use_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:visibility="gone"> - <TextView android:id="@+id/toast_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:paddingTop="5dp" - android:paddingBottom="5dp" - android:textAppearance="?android:textAppearanceMedium" - android:background="@color/on_viewfinder_label_background_color" /> -</com.android.camera.ui.RotateLayout> - diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml index d6430f4..49065fd 100644 --- a/res/layout/pano_capture.xml +++ b/res/layout/pano_capture.xml @@ -71,7 +71,8 @@ <RelativeLayout android:layout_gravity="center" - android:layout_width="@dimen/pano_mosaic_surface_height" + android:layout_weight="1.67" + android:layout_width="0dp" android:layout_height="match_parent"> <com.android.camera.panorama.MosaicRendererSurfaceView android:id="@+id/pano_renderer" diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml index fa4f83b..7b9a92e 100644 --- a/res/layout/pano_review.xml +++ b/res/layout/pano_review.xml @@ -50,11 +50,15 @@ </com.android.camera.ui.RotateLayout> </RelativeLayout> - <ImageView android:id="@+id/pano_reviewarea" - android:rotation="90" - android:scaleType="fitCenter" - android:layout_height="match_parent" - android:layout_width="@dimen/pano_mosaic_surface_height" /> + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_rotate_reviewarea" + android:layout_width="@dimen/pano_mosaic_surface_height" + android:layout_height="match_parent"> + <ImageView android:id="@+id/pano_reviewarea" + android:scaleType="fitCenter" + android:layout_height="match_parent" + android:layout_width="match_parent" /> + </com.android.camera.ui.RotateLayout> <LinearLayout android:id="@+id/pano_review_control" style="@style/PanoViewHorizontalBar" diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml index 31ba61b..bed1fb0 100644 --- a/res/layout/preview_frame.xml +++ b/res/layout/preview_frame.xml @@ -32,7 +32,6 @@ android:visibility="gone"/> <include layout="@layout/focus_indicator"/> <include layout="@layout/priority_indicators"/> - <include layout="@layout/first_hint_toast"/> </com.android.camera.PreviewFrameLayout> <include layout="@layout/indicator_bar" /> </RelativeLayout> diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml index 43d1b5a..dd3ffc9 100644 --- a/res/layout/preview_frame_video.xml +++ b/res/layout/preview_frame_video.xml @@ -48,7 +48,6 @@ android:src="@drawable/ic_gallery_play" android:visibility="gone" android:onClick="onReviewPlayClicked"/> - <include layout="@layout/first_hint_toast"/> </com.android.camera.PreviewFrameLayout> <!-- Fill up the space below preview frame with black. --> diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml new file mode 100644 index 0000000..2c89b6f --- /dev/null +++ b/res/layout/rotate_text_toast.xml @@ -0,0 +1,39 @@ +<?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. +--> + +<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/rotate_toast" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone"> + + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/toast_frame_holo"> + <TextView + android:id="@+id/message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:textAppearanceMedium" + android:textColor="@android:color/white" + android:shadowColor="#BB000000" + android:shadowRadius="2.75" /> + </FrameLayout> +</com.android.camera.ui.RotateLayout> + + |