diff options
Diffstat (limited to 'res/layout')
| -rwxr-xr-x[-rw-r--r--] | res/layout/capture_module.xml | 28 | ||||
| -rwxr-xr-x | res/layout/one_ui_layout.xml | 18 |
2 files changed, 25 insertions, 21 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index fc05fd0ca..0063a2e6a 100644..100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -67,30 +67,24 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <com.android.camera.ui.RotateLayout - android:id="@+id/recording_time_rect" + + <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent"> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <com.android.camera.ui.RotateLayout + android:id="@+id/recording_time_rect" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="horizontal"> - - <com.android.camera.PauseButton - android:id="@+id/video_pause" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="70dp" - android:padding="23dp" - android:src="@drawable/btn_pause_recording"/> - + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:visibility="gone" + android:layout_marginLeft="24dp" + android:layout_marginTop="80dp"> <include android:id="@+id/labels" layout="@layout/viewfinder_labels_video"/> - </LinearLayout> - </com.android.camera.ui.RotateLayout> + </com.android.camera.ui.RotateLayout> + </FrameLayout> <include style="@style/CameraControls" diff --git a/res/layout/one_ui_layout.xml b/res/layout/one_ui_layout.xml index d87040cde..53174698c 100755 --- a/res/layout/one_ui_layout.xml +++ b/res/layout/one_ui_layout.xml @@ -40,8 +40,8 @@ <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="@dimen/one_ui_bottom_large" + android:layout_height="@dimen/one_ui_bottom_large" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" @@ -50,14 +50,24 @@ <com.android.camera.ui.RotateImageView android:id="@+id/video_button" - android:layout_width="55dp" - android:layout_height="55dp" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" android:scaleType="fitCenter" android:src="@drawable/video_capture" /> + <com.android.camera.PauseButton + android:id="@+id/video_pause" + android:layout_width="@dimen/one_ui_bottom_small" + android:layout_height="@dimen/one_ui_bottom_small" + android:focusable="true" + android:clickable="true" + android:scaleType="fitCenter" + android:visibility="gone" + android:src="@drawable/btn_pause_recording"/> + <com.android.camera.ui.RotateImageView android:id="@+id/preview_thumb" android:layout_width="@dimen/capture_size" |