diff options
| author | repo sync <cywang@google.com> | 2011-07-14 10:09:24 +0800 |
|---|---|---|
| committer | repo sync <cywang@google.com> | 2011-07-16 01:51:30 +0800 |
| commit | 2b1f214ecbd9c0e40edf827620b59ba00777c948 (patch) | |
| tree | 81aea239a33b34506111f3562a5ccdcb57895347 /res/layout-w1024dp | |
| parent | 5281216188a75f5a2edd87ef5f7358a956f17e28 (diff) | |
| download | LegacyCamera-2b1f214ecbd9c0e40edf827620b59ba00777c948.zip LegacyCamera-2b1f214ecbd9c0e40edf827620b59ba00777c948.tar.gz LegacyCamera-2b1f214ecbd9c0e40edf827620b59ba00777c948.tar.bz2 | |
Merge the different implementations on CameraSwitch.
+enable the camera/video icon rotation for tablet version.
+render disabled effect for tablet only.
Change-Id: I2827cb57ac7d8d60efdb6f3172c89db32ac443d4
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index f6709e3..d52847e 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -69,12 +69,11 @@ android:padding="14dp" android:layout_marginRight="@dimen/mode_switcher_margin_right" android:layout_marginBottom="@dimen/mode_switcher_margin_bottom"> - <RadioButton android:id="@+id/switch_off_button" + <com.android.camera.ui.RotateImageView + android:id="@+id/video_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:button="@android:color/transparent" - android:clickable="false" - android:background="@drawable/btn_ic_mode_switch_video"/> + android:src="@drawable/btn_ic_mode_switch_video"/> <com.android.camera.HorizontalSwitcher android:id="@+id/switcher" android:layout_width="50dp" android:layout_height="18dp" @@ -82,12 +81,11 @@ android:layout_marginRight="@dimen/mode_switcher_inner_margin" android:src="@drawable/toggle_switch_control_holo_dark" android:background="@drawable/toggle_switch_bg_holo_dark" /> - <RadioButton android:id="@+id/switch_on_button" + <com.android.camera.ui.RotateImageView + android:id="@+id/camera_switch_icon" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:button="@android:color/transparent" - android:clickable="false" - android:background="@drawable/btn_ic_mode_switch_camera"/> + android:src="@drawable/btn_ic_mode_switch_camera"/> </com.android.camera.SwitcherSet> </RelativeLayout> |