diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-06-29 19:04:41 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-06-29 20:04:52 +0800 |
| commit | 95fd7f77171155a087b685ca405ac3891332f638 (patch) | |
| tree | 63fef7780d36cc386142c430cf1bcd327b7acec9 /res | |
| parent | 25c0a6c44f32788cb4e14095c48f1452b14530a6 (diff) | |
| download | LegacyCamera-95fd7f77171155a087b685ca405ac3891332f638.zip LegacyCamera-95fd7f77171155a087b685ca405ac3891332f638.tar.gz LegacyCamera-95fd7f77171155a087b685ca405ac3891332f638.tar.bz2 | |
Move the shutter button to the center in phone UI.
bug:4973470
Change-Id: I18bae830c433726e36ef655032be8330932826fd
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/attach_camera_control.xml | 10 | ||||
| -rw-r--r-- | res/layout/camera_control.xml | 36 |
2 files changed, 22 insertions, 24 deletions
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml index 7c0e6dd..7e8806a 100644 --- a/res/layout/attach_camera_control.xml +++ b/res/layout/attach_camera_control.xml @@ -18,8 +18,8 @@ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" android:layout_height="match_parent" android:layout_width="76dp" - android:layout_marginTop="13dp" - android:layout_marginBottom="10dp" + android:paddingTop="13dp" + android:paddingBottom="3dp" android:layout_alignParentRight="true"> <LinearLayout android:orientation="vertical" android:id="@+id/review_control" @@ -55,11 +55,11 @@ android:text="@string/review_play" /> </LinearLayout> </LinearLayout> + <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" android:scaleType="center" android:clickable="true" android:focusable="true" diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index 2b04ad8..dda02b0 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -18,17 +18,28 @@ android:orientation="vertical" android:layout_height="match_parent" android:layout_width="76dp" - android:layout_marginTop="13dp" - android:layout_marginBottom="10dp"> + android:paddingTop="13dp" + android:paddingBottom="3dp"> <include layout="@layout/review_thumbnail"/> - <com.android.camera.SwitcherSet android:id="@+id/camera_switch" - android:orientation="vertical" - android:gravity="center" + <com.android.camera.ShutterButton android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_centerInParent="true" + android:scaleType="center" + android:clickable="true" + android:focusable="true" + android:src="@drawable/btn_ic_camera_shutter" + android:background="@drawable/btn_shutter"/> + + <com.android.camera.SwitcherSet android:id="@+id/camera_switch" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_width="wrap_content"> + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:orientation="vertical" + android:gravity="center"> <com.android.camera.ui.RotateImageView android:id="@+id/video_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" @@ -42,19 +53,6 @@ android:id="@+id/camera_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_marginBottom="3dp" android:src="@drawable/btn_ic_mode_switch_camera"/> </com.android.camera.SwitcherSet> - - <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:scaleType="center" - android:clickable="true" - android:focusable="true" - android:src="@drawable/btn_ic_camera_shutter" - android:background="@drawable/btn_shutter"/> </RelativeLayout> - |