diff options
| author | Byunghun Jeon <bjeon@codeaurora.org> | 2015-08-03 17:42:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-08-12 18:03:03 -0700 |
| commit | e713237ec94737904e339ce05a6d09fed5d9a72d (patch) | |
| tree | 1ba6ce4732747a79e382125298a78ec40c376419 /res | |
| parent | 4cc34823df8e420c366d4bf4497d7f906676a022 (diff) | |
| download | android_packages_apps_Snap-e713237ec94737904e339ce05a6d09fed5d9a72d.tar.gz android_packages_apps_Snap-e713237ec94737904e339ce05a6d09fed5d9a72d.tar.bz2 android_packages_apps_Snap-e713237ec94737904e339ce05a6d09fed5d9a72d.zip | |
Revert "SnapdragonCamera: Improved panorama"
This reverts commit "SnapdragonCamera: Improved panorama"
Change-Id: I7aef9427c218d06b78cbc097dd32a1629b5ab9d1
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/pano_module_capture.xml | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index 56ef4f2c2..ad34cf808 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -25,10 +25,11 @@ android:layout_height="match_parent" android:layout_gravity="center" > - <SurfaceView - android:id="@+id/pano_preview_surfaceview" + <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" @@ -74,8 +75,44 @@ android:layout_height="0dp" android:layout_weight="1" android:gravity="top" - android:paddingTop="50dp" > + android:paddingTop="20dp" > + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:orientation="horizontal" > + + <ImageView + android:id="@+id/pano_pan_left_indicator" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginRight="5dp" + 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:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:layout_toRightOf="@id/pano_pan_progress_bar" + android:layout_weight="1" + android:gravity="center_vertical" + android:src="@drawable/pano_direction_right_indicator" + android:visibility="gone" /> + </LinearLayout> </FrameLayout> </LinearLayout> @@ -89,16 +126,4 @@ android:textAppearance="?android:textAppearanceMedium" android:visibility="gone" /> - <FrameLayout - android:id="@+id/pano_capture_preview_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ImageView - android:id="@+id/pano_capture_preview" - android:layout_width="match_parent" - android:layout_height="100dp" - android:layout_gravity="center" /> - </FrameLayout> - </FrameLayout> |