diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-17 00:53:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 00:53:33 -0700 |
| commit | 74fe6dc0918c8129210cdcf1816a6a052d737997 (patch) | |
| tree | 1a1d8980260f6643c1551af494ba050b0afa86d2 /res/layout-w1024dp | |
| parent | e46486104523760a4433f03e09ed615987d83b6c (diff) | |
| parent | adab2bddc93bf4af535cb58e7167bf8690d97d8c (diff) | |
| download | LegacyCamera-74fe6dc0918c8129210cdcf1816a6a052d737997.zip LegacyCamera-74fe6dc0918c8129210cdcf1816a6a052d737997.tar.gz LegacyCamera-74fe6dc0918c8129210cdcf1816a6a052d737997.tar.bz2 | |
Merge "Add Sprung Lever Zoom Control for Phone UI."
Diffstat (limited to 'res/layout-w1024dp')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index 342d167..9897dc6 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -40,6 +40,11 @@ android:clickable="true" android:focusable="true" android:background="@drawable/btn_shutter" /> + <com.android.camera.ui.ZoomPicker + android:id="@+id/zoom_control" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"/> <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment" android:clickable="true" android:layout_width="wrap_content" |