diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/list_sub_menu_item.xml | 3 | ||||
| -rw-r--r-- | res/layout/pano_module_capture.xml | 55 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
3 files changed, 44 insertions, 16 deletions
diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml index f2b043692..db417d689 100644 --- a/res/layout/list_sub_menu_item.xml +++ b/res/layout/list_sub_menu_item.xml @@ -36,12 +36,15 @@ android:layout_width="@dimen/setting_item_icon_width" android:layout_height="@dimen/setting_item_icon_width" android:layout_marginRight="@dimen/setting_item_list_margin" + android:layout_alignParentLeft="true" + android:layout_centerInParent="true" android:adjustViewBounds="true" android:scaleType="fitCenter" /> <TextView android:id="@+id/text" style="@style/CustomSettingItemTitle" + android:layout_toRightOf="@+id/image" android:shadowColor="@android:color/transparent" android:shadowDx="1" android:shadowDy="1" 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> diff --git a/res/values/styles.xml b/res/values/styles.xml index f893aaa48..c6b99624e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -85,7 +85,7 @@ <item name="android:gravity">left|center_vertical</item> <item name="android:singleLine">true</item> <item name="android:layout_weight">1</item> - <item name="android:layout_width">0dp</item> + <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> </style> <style name="SettingItemTitle"> |