diff options
author | Jay Wang <jaywang@codeaurora.org> | 2015-01-13 11:21:58 -0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2015-01-13 11:21:58 -0800 |
commit | 71656de68587521161596af5db9c688be3fba40a (patch) | |
tree | c754f237aa651c0ef28600df494a28054e498c52 /res/layout-port/pano_preview_progress.xml | |
parent | 47890d45e3fe25eac6186ee946db6fcaa5354b3f (diff) | |
download | android_packages_apps_Snap-71656de68587521161596af5db9c688be3fba40a.tar.gz android_packages_apps_Snap-71656de68587521161596af5db9c688be3fba40a.tar.bz2 android_packages_apps_Snap-71656de68587521161596af5db9c688be3fba40a.zip |
Revert "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"
This reverts commit 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.
Diffstat (limited to 'res/layout-port/pano_preview_progress.xml')
-rw-r--r-- | res/layout-port/pano_preview_progress.xml | 136 |
1 files changed, 102 insertions, 34 deletions
diff --git a/res/layout-port/pano_preview_progress.xml b/res/layout-port/pano_preview_progress.xml index 426ef0ba7..c6c131741 100644 --- a/res/layout-port/pano_preview_progress.xml +++ b/res/layout-port/pano_preview_progress.xml @@ -14,38 +14,106 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/panorama_preview_progress" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="100dp"> - - <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" +<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" + 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: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" /> + + <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 --> + <FrameLayout + style="@style/PanoViewHorizontalBar" + android:paddingTop="20dp" + android:gravity="top" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <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 + 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> + </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" /> -</RelativeLayout> + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone" /> +</FrameLayout> |