diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-10-10 15:26:40 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-10-10 18:01:33 +0800 |
| commit | 6f2283fbf049ad1f9870a86474af295604d95600 (patch) | |
| tree | 079deb8e307cd2e05df63cab30a4e4bc7b75dc46 /res/layout-xlarge | |
| parent | ffa723488214471cdc9ea58173728c05e7b3fceb (diff) | |
| download | LegacyCamera-6f2283fbf049ad1f9870a86474af295604d95600.zip LegacyCamera-6f2283fbf049ad1f9870a86474af295604d95600.tar.gz LegacyCamera-6f2283fbf049ad1f9870a86474af295604d95600.tar.bz2 | |
Add camera setting icons around the shutter button.
The icons are not clickable yet.
Change-Id: Ic88197386884849da32774aed932f358043b61b5
Diffstat (limited to 'res/layout-xlarge')
| -rw-r--r-- | res/layout-xlarge/camera_control.xml | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml index 91e11ce..31ee6be 100644 --- a/res/layout-xlarge/camera_control.xml +++ b/res/layout-xlarge/camera_control.xml @@ -17,7 +17,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/control_bar" android:layout_height="match_parent" - android:layout_width="190dp" + android:layout_width="240dp" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" android:layout_marginLeft="10dp" @@ -41,32 +41,35 @@ android:layout="@layout/zoom_picker" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_toRightOf="@id/image_list" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_centerInParent="true"/> - <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_centerInParent="true" - android:layout_alignParentRight="true" - android:layout_toRightOf="@id/image_list" - 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"/> + <com.android.camera.ui.SettingsWheel android:id="@+id/settings_wheel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_alignParentRight="true" + android:layout_toRightOf="@id/image_list"> + <com.android.camera.ShutterButton android:id="@+id/shutter_button" + 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" /> + </com.android.camera.ui.SettingsWheel> <LinearLayout android:id="@+id/camera_switch_set" android:orientation="vertical" android:gravity="center" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:layout_toRightOf="@id/image_list" android:layout_height="wrap_content" - android:layout_width="wrap_content"> + android:layout_width="wrap_content" + android:layout_marginRight="17dp"> <com.android.camera.RotateImageView android:id="@+id/video_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" |