diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_pan_progression.png | bin | 1654 -> 14576 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_pan_progression_large.png | bin | 2685 -> 14615 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/ic_pan_progression_xlarge.png | bin | 2685 -> 14615 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_pan_progression.png | bin | 1097 -> 14560 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_pan_progression_xlarge.png | bin | 1640 -> 14576 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_pan_progression.png | bin | 2177 -> 14599 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_pan_progression_xlarge.png | bin | 3692 -> 14643 bytes | |||
| -rw-r--r-- | res/layout/pano_module_capture.xml | 119 | ||||
| -rw-r--r-- | res/values-port/dimensions.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 4 |
10 files changed, 69 insertions, 56 deletions
diff --git a/res/drawable-hdpi/ic_pan_progression.png b/res/drawable-hdpi/ic_pan_progression.png Binary files differindex 69650f0b7..b27714334 100644 --- a/res/drawable-hdpi/ic_pan_progression.png +++ b/res/drawable-hdpi/ic_pan_progression.png diff --git a/res/drawable-hdpi/ic_pan_progression_large.png b/res/drawable-hdpi/ic_pan_progression_large.png Binary files differindex afe91889f..a5ce53af0 100644 --- a/res/drawable-hdpi/ic_pan_progression_large.png +++ b/res/drawable-hdpi/ic_pan_progression_large.png diff --git a/res/drawable-hdpi/ic_pan_progression_xlarge.png b/res/drawable-hdpi/ic_pan_progression_xlarge.png Binary files differindex afe91889f..7892c504b 100644 --- a/res/drawable-hdpi/ic_pan_progression_xlarge.png +++ b/res/drawable-hdpi/ic_pan_progression_xlarge.png diff --git a/res/drawable-mdpi/ic_pan_progression.png b/res/drawable-mdpi/ic_pan_progression.png Binary files differindex 9425f324c..ee53169d2 100644 --- a/res/drawable-mdpi/ic_pan_progression.png +++ b/res/drawable-mdpi/ic_pan_progression.png diff --git a/res/drawable-mdpi/ic_pan_progression_xlarge.png b/res/drawable-mdpi/ic_pan_progression_xlarge.png Binary files differindex d75ec8bbe..218d2b35d 100644 --- a/res/drawable-mdpi/ic_pan_progression_xlarge.png +++ b/res/drawable-mdpi/ic_pan_progression_xlarge.png diff --git a/res/drawable-xhdpi/ic_pan_progression.png b/res/drawable-xhdpi/ic_pan_progression.png Binary files differindex 756edb71d..9610c2de5 100644 --- a/res/drawable-xhdpi/ic_pan_progression.png +++ b/res/drawable-xhdpi/ic_pan_progression.png diff --git a/res/drawable-xhdpi/ic_pan_progression_xlarge.png b/res/drawable-xhdpi/ic_pan_progression_xlarge.png Binary files differindex 22d8a4eed..91484d21c 100644 --- a/res/drawable-xhdpi/ic_pan_progression_xlarge.png +++ b/res/drawable-xhdpi/ic_pan_progression_xlarge.png diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index 6ab8c9e4b..ad34cf808 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -16,105 +16,114 @@ <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:layout_width="match_parent" + android:layout_height="match_parent" > + + <FrameLayout + android:id="@+id/pano_preview_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" > + + <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:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/ic_pan_border_fast" + android:visibility="gone" /> + </FrameLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" > <!-- The top bar with capture indication --> <FrameLayout style="@style/PanoViewHorizontalBar" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"> + android:layout_weight="1" > <TextView android:id="@+id/pano_capture_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" 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" /> + android:visibility="gone" /> </FrameLayout> - <FrameLayout - android:layout_gravity="center" - android:id="@+id/pano_preview_layout" - android:layout_weight="@integer/SRI_pano_layout_weight" + <View + android:id="@+id/pano_dummy_layout" 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> + android:layout_height="0dp" + android:layout_weight="@integer/SRI_pano_layout_weight" + android:visibility="invisible" /> <!-- The bottom bar with progress bar and direction indicators --> <FrameLayout android:id="@+id/pano_progress_layout" style="@style/PanoViewHorizontalBar" - android:paddingTop="20dp" - android:gravity="top" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"> + android:layout_weight="1" + android:gravity="top" + android:paddingTop="20dp" > - <RelativeLayout + <LinearLayout 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" /> + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:orientation="horizontal" > <ImageView android:id="@+id/pano_pan_left_indicator" - android:src="@drawable/pano_direction_left_indicator" - android:visibility="gone" + android:layout_width="0dp" + android:layout_height="wrap_content" 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" /> + android:layout_weight="1" + android:gravity="center_vertical" + android:src="@drawable/pano_direction_left_indicator" + android:visibility="gone" /> + + <com.android.camera.PanoProgressBar + android:id="@+id/pano_pan_progress_bar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="9" + android:gravity="center_vertical" + android:src="@drawable/ic_pan_progression" + android:visibility="gone" /> <ImageView android:id="@+id/pano_pan_right_indicator" - android:src="@drawable/pano_direction_right_indicator" - android:visibility="gone" + android:layout_width="0dp" + android:layout_height="wrap_content" 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> + android:layout_weight="1" + android:gravity="center_vertical" + android:src="@drawable/pano_direction_right_indicator" + android:visibility="gone" /> + </LinearLayout> </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:text="@string/pano_too_fast_prompt" + android:textAppearance="?android:textAppearanceMedium" android:visibility="gone" /> + </FrameLayout> diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml index 67e3ebc3f..f47567a6c 100644 --- a/res/values-port/dimensions.xml +++ b/res/values-port/dimensions.xml @@ -14,6 +14,6 @@ limitations under the License. --> <resources> - <integer name="SRI_pano_layout_weight">2</integer> + <integer name="SRI_pano_layout_weight">3</integer> <dimen name="count_down_title_margin_top">90dp</dimen> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 24f790c4e..f83b5d8f4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -23,4 +23,8 @@ <!-- This value may be tweaked to save memory on low RAM devices. The value is the percentage of camera preview height/width to scale to. --> <integer name="panorama_frame_size_reduction">100</integer> + + <!-- This value may be changed to true to enable the warped pano preview overlayed on top + of the fullscreen pano preview. --> + <bool name="enable_warped_pano_preview">true</bool> </resources> |
