diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_switch_pan.png | bin | 0 -> 5172 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_switch_pan.png | bin | 0 -> 3063 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_switch_pan.png | bin | 0 -> 7660 bytes | |||
| -rw-r--r-- | res/drawable/pano_direction_left_indicator.xml | 21 | ||||
| -rw-r--r-- | res/drawable/pano_direction_right_indicator.xml | 21 | ||||
| -rw-r--r-- | res/layout-land/camera_controls.xml | 2 | ||||
| -rw-r--r-- | res/layout-land/pano_module_capture.xml | 96 | ||||
| -rw-r--r-- | res/layout-land/pano_module_review.xml | 48 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/pano_module_capture.xml | 96 | ||||
| -rw-r--r-- | res/layout-port/pano_module_review.xml | 60 | ||||
| -rw-r--r-- | res/layout/panorama_module.xml | 26 | ||||
| -rw-r--r-- | res/values-land/styles.xml | 7 | ||||
| -rw-r--r-- | res/values-port/styles.xml | 7 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 |
15 files changed, 378 insertions, 17 deletions
diff --git a/res/drawable-hdpi/ic_switch_pan.png b/res/drawable-hdpi/ic_switch_pan.png Binary files differnew file mode 100644 index 000000000..c8161be3a --- /dev/null +++ b/res/drawable-hdpi/ic_switch_pan.png diff --git a/res/drawable-mdpi/ic_switch_pan.png b/res/drawable-mdpi/ic_switch_pan.png Binary files differnew file mode 100644 index 000000000..e63b8e968 --- /dev/null +++ b/res/drawable-mdpi/ic_switch_pan.png diff --git a/res/drawable-xhdpi/ic_switch_pan.png b/res/drawable-xhdpi/ic_switch_pan.png Binary files differnew file mode 100644 index 000000000..f17ce2f4a --- /dev/null +++ b/res/drawable-xhdpi/ic_switch_pan.png diff --git a/res/drawable/pano_direction_left_indicator.xml b/res/drawable/pano_direction_left_indicator.xml new file mode 100644 index 000000000..a0bfb0af3 --- /dev/null +++ b/res/drawable/pano_direction_left_indicator.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:drawable="@drawable/ic_pan_left_indicator" /> + <item android:drawable="@drawable/ic_pan_left_indicator_fast" /> +</selector> diff --git a/res/drawable/pano_direction_right_indicator.xml b/res/drawable/pano_direction_right_indicator.xml new file mode 100644 index 000000000..c3ce37797 --- /dev/null +++ b/res/drawable/pano_direction_right_indicator.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_enabled="false" + android:drawable="@drawable/ic_pan_right_indicator" /> + <item android:drawable="@drawable/ic_pan_right_indicator_fast" /> +</selector> diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index d1772401e..14953320e 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -40,7 +40,7 @@ android:layout_gravity="right|top" android:layout_marginRight="2dip" /> - <com.android.camera.ui.CameraSwitcher + <com.android.camera.ui.ModuleSwitcher android:id="@+id/camera_switcher" style="@style/SwitcherButton" android:layout_gravity="right|bottom" diff --git a/res/layout-land/pano_module_capture.xml b/res/layout-land/pano_module_capture.xml new file mode 100644 index 000000000..cb7602629 --- /dev/null +++ b/res/layout-land/pano_module_capture.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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:id="@+id/panorama_capture_layout" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!-- The top bar with capture indication --> + <FrameLayout style="@style/PanoViewHorizontalBar"> + <TextView android:id="@+id/pano_capture_indicator" + android:text="@string/pano_capture_indication" + android:textAppearance="?android:textAppearanceMedium" + android:layout_gravity="center" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </FrameLayout> + + <FrameLayout + android:layout_gravity="center" + android:layout_weight="6" + android:layout_width="match_parent" + android:layout_height="0dp"> + <TextureView + android:id="@+id/pano_preview_textureview" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <View + android:id="@+id/pano_preview_area_border" + android:visibility="gone" + android:background="@drawable/ic_pan_border_fast" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <!-- The bottom bar with progress bar and direction indicators --> + <RelativeLayout style="@style/PanoViewHorizontalBar"> + + <com.android.camera.PanoProgressBar + android:id="@+id/pano_pan_progress_bar" + android:visibility="gone" + android:src="@drawable/ic_pan_progression" + android:layout_centerInParent="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <ImageView + android:id="@+id/pano_pan_left_indicator" + android:src="@drawable/pano_direction_left_indicator" + android:visibility="gone" + android:layout_marginRight="5dp" + android:layout_toLeftOf="@id/pano_pan_progress_bar" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ImageView + android:id="@+id/pano_pan_right_indicator" + android:src="@drawable/pano_direction_right_indicator" + android:visibility="gone" + android:layout_marginLeft="5dp" + android:layout_toRightOf="@id/pano_pan_progress_bar" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </RelativeLayout> + + </LinearLayout> + + <!-- The hint for "Too fast" text view --> + <TextView android:id="@+id/pano_capture_too_fast_textview" + android:text="@string/pano_too_fast_prompt" + android:textAppearance="?android:textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone" /> +</FrameLayout> diff --git a/res/layout-land/pano_module_review.xml b/res/layout-land/pano_module_review.xml new file mode 100644 index 000000000..002d47aff --- /dev/null +++ b/res/layout-land/pano_module_review.xml @@ -0,0 +1,48 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pano_review_layout" + android:visibility="gone" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <TextView style="@style/PanoViewHorizontalBar" + android:text="@string/pano_review_rendering" + android:textAppearance="?android:textAppearanceMedium" + android:gravity="center" /> + + <ImageView android:id="@+id/pano_reviewarea" + android:scaleType="fitCenter" + android:layout_width="match_parent" + android:layout_height="@dimen/pano_mosaic_surface_height" /> + + <FrameLayout style="@style/PanoViewHorizontalBar"> + <com.android.camera.PanoProgressBar + android:id="@+id/pano_saving_progress_bar" + android:src="@drawable/ic_pan_progression" + android:layout_gravity="center" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + + <com.android.camera.ui.RotateImageView android:id="@+id/pano_review_cancel_button" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:layout_gravity="center_vertical|right" + android:src="@drawable/ic_menu_cancel_holo_light" /> + </FrameLayout> +</LinearLayout> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 5f89830c5..03e896bc0 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -40,7 +40,7 @@ android:layout_marginBottom="2dip" android:contentDescription="@string/accessibility_menu_button" /> - <com.android.camera.ui.CameraSwitcher + <com.android.camera.ui.ModuleSwitcher android:id="@+id/camera_switcher" style="@style/SwitcherButton" android:layout_gravity="bottom|left" @@ -67,4 +67,4 @@ android:scaleType="centerInside" android:layout_gravity="top|right" /> -</com.android.camera.ui.CameraControls>
\ No newline at end of file +</com.android.camera.ui.CameraControls> diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml new file mode 100644 index 000000000..57c00cded --- /dev/null +++ b/res/layout-port/pano_module_capture.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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:id="@+id/panorama_capture_layout" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!-- The top bar with capture indication --> + <FrameLayout style="@style/PanoViewHorizontalBar"> + <TextView android:id="@+id/pano_capture_indicator" + android:text="@string/pano_capture_indication" + android:textAppearance="?android:textAppearanceMedium" + android:layout_gravity="center" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </FrameLayout> + + <FrameLayout + android:layout_gravity="center" + android:layout_weight="3" + android:layout_width="match_parent" + android:layout_height="0dp"> + <TextureView + android:id="@+id/pano_preview_textureview" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <View + android:id="@+id/pano_preview_area_border" + android:visibility="gone" + android:background="@drawable/ic_pan_border_fast" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </FrameLayout> + + <!-- The bottom bar with progress bar and direction indicators --> + <RelativeLayout style="@style/PanoViewHorizontalBar"> + + <com.android.camera.PanoProgressBar + android:id="@+id/pano_pan_progress_bar" + android:visibility="gone" + android:src="@drawable/ic_pan_progression" + android:layout_centerInParent="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <ImageView + android:id="@+id/pano_pan_left_indicator" + android:src="@drawable/pano_direction_left_indicator" + android:visibility="gone" + android:layout_marginRight="5dp" + android:layout_toLeftOf="@id/pano_pan_progress_bar" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ImageView + android:id="@+id/pano_pan_right_indicator" + android:src="@drawable/pano_direction_right_indicator" + android:visibility="gone" + android:layout_marginLeft="5dp" + android:layout_toRightOf="@id/pano_pan_progress_bar" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </RelativeLayout> + + </LinearLayout> + + <!-- The hint for "Too fast" text view --> + <TextView android:id="@+id/pano_capture_too_fast_textview" + android:text="@string/pano_too_fast_prompt" + android:textAppearance="?android:textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone" /> +</FrameLayout> diff --git a/res/layout-port/pano_module_review.xml b/res/layout-port/pano_module_review.xml new file mode 100644 index 000000000..3c5eb2cfc --- /dev/null +++ b/res/layout-port/pano_module_review.xml @@ -0,0 +1,60 @@ +<?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:id="@+id/pano_review_layout" + android:visibility="gone" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <TextView style="@style/PanoViewHorizontalBar" + android:text="@string/pano_review_rendering" + android:textAppearance="?android:textAppearanceMedium" + android:gravity="center" /> + + <ImageView android:id="@+id/pano_reviewarea" + android:scaleType="fitCenter" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1.5" /> + + <View style="@style/PanoViewHorizontalBar"/> + </LinearLayout> + + <LinearLayout + android:orientation="vertical" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_gravity="center_horizontal|bottom"> + + <com.android.camera.PanoProgressBar + android:id="@+id/pano_saving_progress_bar" + android:src="@drawable/ic_pan_progression" + android:layout_gravity="center_horizontal" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + + <ImageView android:id="@id/pano_review_cancel_button" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:layout_gravity="center_horizontal" + android:src="@drawable/ic_menu_cancel_holo_light" /> + </LinearLayout> +</FrameLayout> diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml new file mode 100644 index 000000000..64063a20d --- /dev/null +++ b/res/layout/panorama_module.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2012 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:id="@+id/pano_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <include layout="@layout/pano_module_capture" /> + <include layout="@layout/pano_module_review" /> + <include layout="@layout/camera_controls" + android:layout_gravity="center" + style="@style/CameraControls"/> +</FrameLayout> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 6ca7e9175..69b524e70 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -56,13 +56,6 @@ <item name="android:layout_marginBottom">13dp</item> <item name="android:layout_marginTop">13dp</item> </style> - <style name="PanoViewHorizontalBar"> - <item name="android:background">#000000</item> - <item name="android:alpha">1.0</item> - <item name="android:layout_height">0dp</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_weight">1.5</item> - </style> <style name="SettingPopupWindow_xlarge"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index 46871c626..830b0c754 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -47,13 +47,6 @@ <item name="android:layout_marginLeft">13dp</item> <item name="android:layout_marginRight">13dp</item> </style> - <style name="PanoViewHorizontalBar"> - <item name="android:background">#000000</item> - <item name="android:alpha">1.0</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">0dp</item> - <item name="android:layout_weight">1</item> - </style> <style name="SettingPopupWindow_xlarge"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2fd7dbd24..23a5f5c79 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -264,4 +264,11 @@ <item name="android:drawablePadding">8dp</item> <item name="android:background">@drawable/bg_pressed</item> </style> + <style name="PanoViewHorizontalBar"> + <item name="android:background">#000000</item> + <item name="android:alpha">1.0</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">0dp</item> + <item name="android:layout_weight">1.5</item> + </style> </resources> |
