diff options
Diffstat (limited to 'res/layout/camera_controls.xml')
| -rw-r--r-- | res/layout/camera_controls.xml | 112 |
1 files changed, 63 insertions, 49 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 04c2f9e46..5e6993e12 100644 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -71,67 +71,81 @@ android:id="@+id/bottom_bar" android:layout_width="match_parent" android:layout_height="@dimen/preview_bottom_margin" - android:gravity="center" - android:weightSum="100" android:background="@drawable/camera_controls_bg_opaque" - android:orientation="horizontal"> - - <com.android.camera.ui.RotateImageView - android:id="@+id/preview_thumb" - android:layout_width="0dp" - android:layout_height="@dimen/thumbnail_size" - android:layout_weight="25" - android:layout_gravity="center_horizontal|center_vertical" - android:background="@android:color/transparent" - android:contentDescription="@string/switch_photo_filmstrip" - android:scaleType="fitCenter" /> + android:orientation="vertical"> <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" android:gravity="center" - android:layout_weight="50" + android:weightSum="100" android:orientation="horizontal"> - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <com.android.camera.ui.RotateImageView + android:id="@+id/preview_thumb" + android:layout_width="0dp" + android:layout_height="@dimen/thumbnail_size" + android:layout_weight="25" android:layout_gravity="center_horizontal|center_vertical" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="fitCenter" - android:src="@drawable/btn_new_shutter" /> - - <ImageView - android:id="@+id/video_button" - android:visibility="gone" - android:layout_width="wrap_content" + android:background="@android:color/transparent" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="fitCenter" /> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:gravity="center" + android:layout_weight="50" + android:orientation="horizontal"> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|center_vertical" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/btn_new_shutter" /> + + <ImageView + android:id="@+id/video_button" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|center_vertical" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/btn_new_shutter_video" /> + + </LinearLayout> + + <FrameLayout + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|center_vertical" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="fitCenter" - android:src="@drawable/btn_new_shutter_video" /> + android:layout_weight="25"> - </LinearLayout> + <com.android.camera.ui.ModuleSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="center" + android:scaleType="center" + android:contentDescription="@string/accessibility_mode_picker" /> + </FrameLayout> - <FrameLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="25"> + </LinearLayout> - <com.android.camera.ui.ModuleSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_gravity="center" - android:scaleType="center" - android:contentDescription="@string/accessibility_mode_picker" /> - </FrameLayout> + <ViewStub + android:id="@+id/review_control_stub" + android:layout="@layout/review_module_control" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - </LinearLayout> + </LinearLayout> <LinearLayout android:id="@+id/remaining_photos" |