summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/btn_ic_camera.pngbin0 -> 756 bytes
-rw-r--r--res/drawable-hdpi/btn_ic_panorama.pngbin0 -> 1379 bytes
-rw-r--r--res/drawable-hdpi/btn_ic_video.pngbin0 -> 389 bytes
-rw-r--r--res/drawable-hdpi/btn_mode_background.pngbin0 -> 460 bytes
-rw-r--r--res/drawable-mdpi/btn_ic_camera.pngbin0 -> 756 bytes
-rw-r--r--res/drawable-mdpi/btn_ic_panorama.pngbin0 -> 1379 bytes
-rw-r--r--res/drawable-mdpi/btn_ic_video.pngbin0 -> 389 bytes
-rw-r--r--res/drawable-mdpi/btn_mode_background.pngbin0 -> 460 bytes
-rw-r--r--res/layout-w1024dp/camera_control.xml30
-rw-r--r--res/layout-w1024dp/mode_picker.xml54
-rw-r--r--res/layout-w1024dp/pano_control.xml37
-rw-r--r--res/layout/camera_control.xml26
-rw-r--r--res/layout/mode_picker.xml50
-rw-r--r--res/layout/pano_control.xml2
-rw-r--r--res/layout/panorama.xml4
-rw-r--r--res/values/strings.xml10
16 files changed, 157 insertions, 56 deletions
diff --git a/res/drawable-hdpi/btn_ic_camera.png b/res/drawable-hdpi/btn_ic_camera.png
new file mode 100644
index 0000000..cc6610f
--- /dev/null
+++ b/res/drawable-hdpi/btn_ic_camera.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_ic_panorama.png b/res/drawable-hdpi/btn_ic_panorama.png
new file mode 100644
index 0000000..e4db1ff
--- /dev/null
+++ b/res/drawable-hdpi/btn_ic_panorama.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_ic_video.png b/res/drawable-hdpi/btn_ic_video.png
new file mode 100644
index 0000000..dacc261
--- /dev/null
+++ b/res/drawable-hdpi/btn_ic_video.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_mode_background.png b/res/drawable-hdpi/btn_mode_background.png
new file mode 100644
index 0000000..cd0c34e
--- /dev/null
+++ b/res/drawable-hdpi/btn_mode_background.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_ic_camera.png b/res/drawable-mdpi/btn_ic_camera.png
new file mode 100644
index 0000000..cc6610f
--- /dev/null
+++ b/res/drawable-mdpi/btn_ic_camera.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_ic_panorama.png b/res/drawable-mdpi/btn_ic_panorama.png
new file mode 100644
index 0000000..e4db1ff
--- /dev/null
+++ b/res/drawable-mdpi/btn_ic_panorama.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_ic_video.png b/res/drawable-mdpi/btn_ic_video.png
new file mode 100644
index 0000000..dacc261
--- /dev/null
+++ b/res/drawable-mdpi/btn_ic_video.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_mode_background.png b/res/drawable-mdpi/btn_mode_background.png
new file mode 100644
index 0000000..cd0c34e
--- /dev/null
+++ b/res/drawable-mdpi/btn_mode_background.png
Binary files differ
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>
diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-w1024dp/mode_picker.xml
new file mode 100644
index 0000000..90cc008
--- /dev/null
+++ b/res/layout-w1024dp/mode_picker.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/mode_picker"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="72dp"
+ android:layout_marginRight="72dp"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentBottom="true">
+ <com.android.camera.ui.RotateImageView android:id="@+id/current_mode"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:background="@drawable/btn_mode_background"
+ android:src="@drawable/btn_ic_camera" />
+ <LinearLayout android:id="@+id/mode_selection"
+ android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@android:color/black"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:gravity="center"
+ android:visibility="invisible">
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ 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:src="@drawable/btn_ic_video" />
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:src="@drawable/btn_ic_camera" />
+ </LinearLayout>
+</com.android.camera.ModePicker>
+
diff --git a/res/layout-w1024dp/pano_control.xml b/res/layout-w1024dp/pano_control.xml
new file mode 100644
index 0000000..1882ff6
--- /dev/null
+++ b/res/layout-w1024dp/pano_control.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/camera_control_width"
+ android:layout_alignParentRight="true">
+
+ <include layout="@layout/review_thumbnail"/>
+
+ <com.android.camera.ShutterButton android:id="@+id/pano_shutter_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="32dp"
+ android:scaleType="center"
+ android:clickable="true"
+ android:focusable="true"
+ android:src="@drawable/btn_ic_camera_shutter"
+ android:background="@drawable/btn_shutter"/>
+
+ <include layout="@layout/mode_picker"/>
+</RelativeLayout>
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml
index f2790fb..283f77b 100644
--- a/res/layout/camera_control.xml
+++ b/res/layout/camera_control.xml
@@ -17,7 +17,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="76dp"
- android:paddingTop="13dp"
+ android:paddingTop="24dp"
android:paddingBottom="3dp">
<include layout="@layout/review_thumbnail"/>
@@ -32,26 +32,6 @@
android:src="@drawable/btn_ic_camera_shutter"
android:background="@drawable/btn_shutter"/>
- <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"
- android:orientation="vertical"
- android:gravity="center">
- <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_normal"/>
- <com.android.camera.Switcher android:id="@+id/switcher"
- android:layout_width="wrap_content"
- android:layout_height="70dp"
- android:src="@drawable/btn_mode_switch_knob"
- android:background="@drawable/btn_mode_switch_bg" />
- <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_normal"/>
- </com.android.camera.SwitcherSet>
+ <include layout="@layout/mode_picker"/>
+
</RelativeLayout>
diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml
new file mode 100644
index 0000000..f9f8530
--- /dev/null
+++ b/res/layout/mode_picker.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/mode_picker"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="12dp"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentBottom="true">
+ <com.android.camera.ui.RotateImageView android:id="@+id/current_mode"
+ android:layout_alignParentBottom="true"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:background="@drawable/btn_mode_background"
+ android:src="@drawable/btn_ic_camera" />
+ <LinearLayout android:id="@+id/mode_selection"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@android:color/black"
+ android:layout_alignParentBottom="true"
+ android:gravity="center"
+ android:visibility="invisible">
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ 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:src="@drawable/btn_ic_video" />
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:src="@drawable/btn_ic_camera" />
+ </LinearLayout>
+</com.android.camera.ModePicker>
diff --git a/res/layout/pano_control.xml b/res/layout/pano_control.xml
index 530ffc6..0faa595 100644
--- a/res/layout/pano_control.xml
+++ b/res/layout/pano_control.xml
@@ -29,4 +29,6 @@
android:focusable="true"
android:src="@drawable/btn_ic_camera_shutter"
android:background="@drawable/btn_shutter"/>
+
+ <include layout="@layout/mode_picker"/>
</RelativeLayout>
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml
index b92d81d..30f0bd7 100644
--- a/res/layout/panorama.xml
+++ b/res/layout/panorama.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/panorama_root"
android:orientation="horizontal"
@@ -22,4 +22,4 @@
android:layout_height="match_parent">
<include layout="@layout/pano_views"/>
<include layout="@layout/pano_control"/>
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8772f3a..f1758bd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -283,8 +283,14 @@
<!-- The text to show the current zoom factor. [CHAR LIMIT=NONE] -->
<string name="zoom_text">Zoom <xliff:g id="zoom_text" example="1.1x">%s</xliff:g></string>
- <string name="switch_to_camera_lable">Switch to camera</string>
- <string name="switch_to_video_lable">Switch to video</string>
+ <!-- The text of menu item to switch the mode to Camera. [CHAR LIMIT=NONE] -->
+ <string name="switch_to_camera_label">Switch to camera</string>
+
+ <!-- The text of menu item to switch the mode to Video. [CHAR LIMIT=NONE] -->
+ <string name="switch_to_video_label">Switch to video</string>
+
+ <!-- The text of menu item to switch the mode to Panorama. [CHAR LIMIT=NONE] -->
+ <string name="switch_to_panorama_label">Switch to panorama</string>
<string name="setting_increment" translatable="false">&gt;</string>
<string name="setting_decrement" translatable="false">&lt;</string>
generated by cgit v1.1 at 2025-01-11 18:28:03 +0000