diff options
author | Jay Wang <jaywang@codeaurora.org> | 2014-12-26 18:10:22 -0800 |
---|---|---|
committer | Byunghun Jeon <bjeon@codeaurora.org> | 2015-02-09 20:00:21 -0800 |
commit | 30b2309e7c40a46ea9506344c25b58c9e8ce8dde (patch) | |
tree | fde7703eb9feb2d676b522dfb2bf8c3d0b78b144 /res/layout/pano_module_capture.xml | |
parent | 5e266938aac08975bbe198915adda22cc59ffebe (diff) | |
download | android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.tar.gz android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.tar.bz2 android_packages_apps_Snap-30b2309e7c40a46ea9506344c25b58c9e8ce8dde.zip |
SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot
Changed the Panoramic preview to full screen
Resized the warped preview image to smaller Size
and render on top of the full screen preview image
Warped preview image can be turned on/off
Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
Diffstat (limited to 'res/layout/pano_module_capture.xml')
-rw-r--r-- | res/layout/pano_module_capture.xml | 119 |
1 files changed, 64 insertions, 55 deletions
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> |