diff options
| -rw-r--r-- | res/drawable-hdpi/btn_mode_switch_bg_v2.9.png | bin | 0 -> 1218 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/btn_mode_switch_knob_v2_normal.png | bin | 0 -> 422 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/btn_mode_switch_knob_v2_pressed.png | bin | 0 -> 399 bytes | |||
| -rw-r--r-- | res/drawable-hdpi/mode_switch_bg_v2.9.png | bin | 0 -> 903 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/btn_mode_switch_bg_v2.9.png | bin | 0 -> 1218 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/btn_mode_switch_knob_v2_normal.png | bin | 0 -> 422 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/btn_mode_switch_knob_v2_pressed.png | bin | 0 -> 399 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/mode_switch_bg_v2.9.png | bin | 0 -> 903 bytes | |||
| -rw-r--r-- | res/drawable/btn_mode_switch_knob_v2.xml | 22 | ||||
| -rw-r--r-- | res/layout-xlarge/camera_control.xml | 27 | ||||
| -rw-r--r-- | res/layout-xlarge/review_thumbnail.xml | 7 | ||||
| -rw-r--r-- | src/com/android/camera/Switcher.java | 3 |
12 files changed, 43 insertions, 16 deletions
diff --git a/res/drawable-hdpi/btn_mode_switch_bg_v2.9.png b/res/drawable-hdpi/btn_mode_switch_bg_v2.9.png Binary files differnew file mode 100644 index 0000000..5396f14 --- /dev/null +++ b/res/drawable-hdpi/btn_mode_switch_bg_v2.9.png diff --git a/res/drawable-hdpi/btn_mode_switch_knob_v2_normal.png b/res/drawable-hdpi/btn_mode_switch_knob_v2_normal.png Binary files differnew file mode 100644 index 0000000..7737fb3 --- /dev/null +++ b/res/drawable-hdpi/btn_mode_switch_knob_v2_normal.png diff --git a/res/drawable-hdpi/btn_mode_switch_knob_v2_pressed.png b/res/drawable-hdpi/btn_mode_switch_knob_v2_pressed.png Binary files differnew file mode 100644 index 0000000..fc431b5 --- /dev/null +++ b/res/drawable-hdpi/btn_mode_switch_knob_v2_pressed.png diff --git a/res/drawable-hdpi/mode_switch_bg_v2.9.png b/res/drawable-hdpi/mode_switch_bg_v2.9.png Binary files differnew file mode 100644 index 0000000..a27c935 --- /dev/null +++ b/res/drawable-hdpi/mode_switch_bg_v2.9.png diff --git a/res/drawable-mdpi/btn_mode_switch_bg_v2.9.png b/res/drawable-mdpi/btn_mode_switch_bg_v2.9.png Binary files differnew file mode 100644 index 0000000..5396f14 --- /dev/null +++ b/res/drawable-mdpi/btn_mode_switch_bg_v2.9.png diff --git a/res/drawable-mdpi/btn_mode_switch_knob_v2_normal.png b/res/drawable-mdpi/btn_mode_switch_knob_v2_normal.png Binary files differnew file mode 100644 index 0000000..7737fb3 --- /dev/null +++ b/res/drawable-mdpi/btn_mode_switch_knob_v2_normal.png diff --git a/res/drawable-mdpi/btn_mode_switch_knob_v2_pressed.png b/res/drawable-mdpi/btn_mode_switch_knob_v2_pressed.png Binary files differnew file mode 100644 index 0000000..fc431b5 --- /dev/null +++ b/res/drawable-mdpi/btn_mode_switch_knob_v2_pressed.png diff --git a/res/drawable-mdpi/mode_switch_bg_v2.9.png b/res/drawable-mdpi/mode_switch_bg_v2.9.png Binary files differnew file mode 100644 index 0000000..a27c935 --- /dev/null +++ b/res/drawable-mdpi/mode_switch_bg_v2.9.png diff --git a/res/drawable/btn_mode_switch_knob_v2.xml b/res/drawable/btn_mode_switch_knob_v2.xml new file mode 100644 index 0000000..f00eac7 --- /dev/null +++ b/res/drawable/btn_mode_switch_knob_v2.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/btn_mode_switch_knob_v2_pressed" /> + <item android:drawable="@drawable/btn_mode_switch_knob_v2_normal" /> +</selector> + + diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml index 6a0c27e..dcf4f88 100644 --- a/res/layout-xlarge/camera_control.xml +++ b/res/layout-xlarge/camera_control.xml @@ -18,10 +18,11 @@ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" android:id="@+id/control_panel" android:layout_height="match_parent" - android:layout_width="134dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="20dp" - android:layout_marginRight="10dp"> + android:layout_width="220dp" + android:layout_marginTop="30dp" + android:layout_marginLeft="-26dp" + android:layout_marginBottom="25dp" + android:layout_marginRight="0dp"> <ViewStub android:id="@+id/zoom_stub" android:inflatedId="@+id/zoom_picker" @@ -30,6 +31,7 @@ android:layout_alignParentLeft="true" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="6dp" android:layout_marginTop="10dp" /> <TextView android:id="@+id/recording_time" @@ -69,21 +71,24 @@ <LinearLayout android:id="@+id/camera_switch_set" android:orientation="vertical" android:gravity="center" + android:layout_height="150dp" + android:layout_width="45dp" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content"> + android:layout_marginLeft="1dp" + android:background="@drawable/mode_switch_bg_v2"> <com.android.camera.RotateImageView android:id="@+id/video_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/btn_ic_mode_switch_video"/> <com.android.camera.Switcher android:id="@+id/camera_switch" android:layout_width="wrap_content" - android:layout_height="70dp" - android:src="@drawable/btn_mode_switch_knob" - android:background="@drawable/btn_mode_switch_bg" /> - <com.android.camera.RotateImageView - android:id="@+id/camera_switch_icon" + android:layout_height="60dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:src="@drawable/btn_mode_switch_knob_v2" + android:background="@drawable/btn_mode_switch_bg_v2" /> + <com.android.camera.RotateImageView android:id="@+id/camera_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/btn_ic_mode_switch_camera"/> diff --git a/res/layout-xlarge/review_thumbnail.xml b/res/layout-xlarge/review_thumbnail.xml index 6ded61f..c85d029 100644 --- a/res/layout-xlarge/review_thumbnail.xml +++ b/res/layout-xlarge/review_thumbnail.xml @@ -16,10 +16,11 @@ <com.android.camera.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/review_thumbnail" - android:layout_width="96dp" - android:layout_height="96dp" + android:layout_width="112dp" + android:layout_height="112dp" android:layout_gravity="center" - android:layout_marginLeft="10dp" + android:layout_marginLeft="27dp" + android:layout_marginRight="27dp" android:clickable="true" android:focusable="false" android:background="@drawable/border_last_picture"/> diff --git a/src/com/android/camera/Switcher.java b/src/com/android/camera/Switcher.java index c88ddb8..e003875 100644 --- a/src/com/android/camera/Switcher.java +++ b/src/com/android/camera/Switcher.java @@ -161,8 +161,7 @@ public class Switcher extends ImageView implements View.OnTouchListener { mPosition = mSwitch ? available : 0; } int offsetTop = getPaddingTop() + mPosition; - int offsetLeft = (getWidth() - - drawableWidth - getPaddingLeft() - getPaddingRight()) / 2; + int offsetLeft = (getWidth() - drawableWidth) / 2; int saveCount = canvas.getSaveCount(); canvas.save(); canvas.translate(offsetLeft, offsetTop); |
