diff options
| author | repo sync <cywang@google.com> | 2011-07-27 19:29:41 +0800 |
|---|---|---|
| committer | repo sync <cywang@google.com> | 2011-07-29 06:32:37 +0800 |
| commit | a72d73cbac59db43d413291e4db66763be08143a (patch) | |
| tree | 23bc183be660a45815b8378cccbe2f3f2b3a42cd /res/layout-w1024dp/camera_control.xml | |
| parent | 07c328d3f67ecfb2b01f9b9765e1d2426c0959fd (diff) | |
| download | packages_apps_LegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.zip packages_apps_LegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.tar.gz packages_apps_LegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.tar.bz2 | |
Add mode picker for camera/camcorder/panaramo
+remove camera switcher
+add menu item for panorama
bug:5039225
Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
Diffstat (limited to 'res/layout-w1024dp/camera_control.xml')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index 5c2b3b5..2bcc6e5 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -60,34 +60,6 @@ android:layout_height="wrap_content" /> </com.android.camera.ui.IndicatorWheel> - <com.android.camera.SwitcherSet android:id="@+id/camera_switch" - android:visibility="invisible" - android:orientation="horizontal" - android:gravity="center_vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:padding="14dp" - android:layout_marginRight="@dimen/mode_switcher_margin_right" - android:layout_marginBottom="@dimen/mode_switcher_margin_bottom"> - <com.android.camera.ui.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.HorizontalSwitcher android:id="@+id/switcher" - android:layout_width="50dp" - android:layout_height="18dp" - android:layout_marginLeft="@dimen/mode_switcher_inner_margin" - android:layout_marginRight="@dimen/mode_switcher_inner_margin" - android:src="@drawable/toggle_switch_control_holo_dark" - android:background="@drawable/toggle_switch_bg_holo_dark" /> - <com.android.camera.ui.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"/> - </com.android.camera.SwitcherSet> + <include layout="@layout/mode_picker"/> </RelativeLayout> |