diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-w1024dp/zoom_picker.xml | 17 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 10 |
2 files changed, 10 insertions, 17 deletions
diff --git a/res/layout-w1024dp/zoom_picker.xml b/res/layout-w1024dp/zoom_picker.xml index 6848d59..fe3bad3 100644 --- a/res/layout-w1024dp/zoom_picker.xml +++ b/res/layout-w1024dp/zoom_picker.xml @@ -17,23 +17,24 @@ */ --> -<com.android.camera.ui.ZoomPicker xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:visibility="gone"> + android:layout_alignParentRight="true"> - <Button android:id="@+id/decrement" + <Button android:id="@+id/zoom_decrement" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/btn_zoom_out" /> + android:background="@drawable/btn_zoom_out" + android:visibility="gone" /> - <Button android:id="@+id/increment" + <Button android:id="@+id/zoom_increment" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/zoom_picker_distance" - android:background="@drawable/btn_zoom_in" /> -</com.android.camera.ui.ZoomPicker> + android:background="@drawable/btn_zoom_in" + android:visibility="gone" /> +</LinearLayout> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index eee2e9b..c28bfcb 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -48,15 +48,7 @@ camera:largeIcons="@array/whitebalance_largeicons" camera:entries="@array/pref_camera_whitebalance_entries" camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/> - <IconListPreference - camera:key="pref_camera_coloreffect_key" - camera:defaultValue="@string/pref_camera_coloreffect_default" - camera:title="@string/pref_camera_coloreffect_title" - camera:singleIcon="@drawable/ic_viewfinder_coloreffect" - camera:images="@array/coloreffect_images" - camera:entries="@array/pref_camera_coloreffect_entries" - camera:entryValues="@array/pref_camera_coloreffect_entryvalues"/> - <IconListPreference + <IconListPreference camera:key="pref_camera_id_key" camera:defaultValue="@string/pref_camera_id_default" camera:title="@string/pref_camera_id_title" |