diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/pano_module_review.xml | 48 | ||||
| -rw-r--r-- | res/layout-land/pano_review_control.xml | 34 | ||||
| -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-port/pano_review_control.xml | 33 | ||||
| -rw-r--r-- | res/layout/pano_module_capture.xml (renamed from res/layout-land/pano_module_capture.xml) | 93 | ||||
| -rw-r--r-- | res/layout/pano_module_review.xml | 50 | ||||
| -rw-r--r-- | res/values-land/dimensions.xml | 1 | ||||
| -rw-r--r-- | res/values-port/dimensions.xml | 18 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 |
10 files changed, 194 insertions, 242 deletions
diff --git a/res/layout-land/pano_module_review.xml b/res/layout-land/pano_module_review.xml deleted file mode 100644 index 002d47aff..000000000 --- a/res/layout-land/pano_module_review.xml +++ /dev/null @@ -1,48 +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. ---> - -<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-land/pano_review_control.xml b/res/layout-land/pano_review_control.xml new file mode 100644 index 000000000..93c1020a8 --- /dev/null +++ b/res/layout-land/pano_review_control.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <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" + android:scaleType="center" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:layout_gravity="center_vertical|right" + android:src="@drawable/ic_menu_cancel_holo_light" /> +</merge>
\ No newline at end of file diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml deleted file mode 100644 index 57c00cded..000000000 --- a/res/layout-port/pano_module_capture.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?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 deleted file mode 100644 index 3c5eb2cfc..000000000 --- a/res/layout-port/pano_module_review.xml +++ /dev/null @@ -1,60 +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: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-port/pano_review_control.xml b/res/layout-port/pano_review_control.xml new file mode 100644 index 000000000..852b486ad --- /dev/null +++ b/res/layout-port/pano_review_control.xml @@ -0,0 +1,33 @@ +<?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. +--> + +<merge xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <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" + android:scaleType="center" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:layout_gravity="center_horizontal|bottom" + android:src="@drawable/ic_menu_cancel_holo_light" /> +</merge>
\ No newline at end of file diff --git a/res/layout-land/pano_module_capture.xml b/res/layout/pano_module_capture.xml index cb7602629..c6c131741 100644 --- a/res/layout-land/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -15,9 +15,9 @@ --> <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"> + android:id="@+id/panorama_capture_layout" + android:layout_height="match_parent" + android:layout_width="match_parent"> <LinearLayout android:layout_width="match_parent" @@ -25,44 +25,64 @@ 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 + style="@style/PanoViewHorizontalBar" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <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"> + android:layout_gravity="center" + android:id="@+id/pano_preview_layout" + android:layout_weight="@integer/SRI_pano_layout_weight" + 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" /> + 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" /> + 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"> + <FrameLayout + style="@style/PanoViewHorizontalBar" + android:paddingTop="20dp" + android:gravity="top" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> - <com.android.camera.PanoProgressBar + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <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 + + <ImageView android:id="@+id/pano_pan_left_indicator" android:src="@drawable/pano_direction_left_indicator" android:visibility="gone" @@ -72,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <ImageView + <ImageView android:id="@+id/pano_pan_right_indicator" android:src="@drawable/pano_direction_right_indicator" android:visibility="gone" @@ -81,16 +101,19 @@ android:layout_centerVertical="true" android:layout_width="wrap_content" android:layout_height="wrap_content" /> - </RelativeLayout> + </RelativeLayout> + </FrameLayout> + </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" /> + <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/pano_module_review.xml b/res/layout/pano_module_review.xml new file mode 100644 index 000000000..3f80e8af0 --- /dev/null +++ b/res/layout/pano_module_review.xml @@ -0,0 +1,50 @@ +<?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:orientation="vertical" + android:visibility="gone" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <TextView + style="@style/PanoViewHorizontalBar" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + 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="@integer/SRI_pano_layout_weight" /> + + <FrameLayout + android:id="@+id/pano_review_control" + style="@style/PanoViewHorizontalBar" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <include layout="@layout/pano_review_control" /> + </FrameLayout> +</LinearLayout> + diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml index 3eae85647..41eea19ed 100644 --- a/res/values-land/dimensions.xml +++ b/res/values-land/dimensions.xml @@ -17,4 +17,5 @@ <!-- for manage cache bar --> <dimen name="manage_cache_bottom_height">39dp</dimen> <dimen name="capture_top_margin">0dip</dimen> + <integer name="SRI_pano_layout_weight">3</integer> </resources> diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml new file mode 100644 index 000000000..6f3fe7636 --- /dev/null +++ b/res/values-port/dimensions.xml @@ -0,0 +1,18 @@ +<?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. +--> +<resources> + <integer name="SRI_pano_layout_weight">2</integer> +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a09bce73f..0d6241588 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -275,8 +275,5 @@ <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> |