diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-04 12:49:18 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-08-05 14:59:39 +0800 |
| commit | b5c569214281e11dc7e8ffc313fbb27e5ff6e5c5 (patch) | |
| tree | 6c58969925574c402bbbe53b818a7105fff3de81 /res/layout-w1024dp | |
| parent | bed7386688cd7810cba23732ab71f370fe3222ff (diff) | |
| download | LegacyCamera-b5c569214281e11dc7e8ffc313fbb27e5ff6e5c5.zip LegacyCamera-b5c569214281e11dc7e8ffc313fbb27e5ff6e5c5.tar.gz LegacyCamera-b5c569214281e11dc7e8ffc313fbb27e5ff6e5c5.tar.bz2 | |
Add the CameraPicker for PhoneUI.
+recover the removed CameraPicker.
Change-Id: I5e45c4f73ce7c082cf420d27a86b922283a83bcc
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 4 | ||||
| -rw-r--r-- | res/layout-w1024dp/mode_picker.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index b86d593..ca70b44 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -54,6 +54,10 @@ android:src="@drawable/btn_zoom_out" android:visibility="gone" /> + <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker" + android:clickable="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> </com.android.camera.ui.IndicatorWheel> <include layout="@layout/mode_picker"/> diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-w1024dp/mode_picker.xml index 90cc008..1ee6226 100644 --- a/res/layout-w1024dp/mode_picker.xml +++ b/res/layout-w1024dp/mode_picker.xml @@ -26,6 +26,7 @@ android:layout_alignParentRight="true" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:background="@drawable/btn_mode_background" android:src="@drawable/btn_ic_camera" /> <LinearLayout android:id="@+id/mode_selection" @@ -40,14 +41,17 @@ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_panorama" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_video" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_video" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera" android:layout_height="62dp" android:layout_width="62dp" + android:scaleType="center" android:src="@drawable/btn_ic_camera" /> </LinearLayout> </com.android.camera.ModePicker> |