summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk2
-rw-r--r--AndroidManifest.xml22
-rw-r--r--res/values-af/cm_strings.xml38
-rw-r--r--res/values-ca/cm_strings.xml38
-rw-r--r--res/values-da/cm_strings.xml37
-rw-r--r--res/values-de/cm_strings.xml37
-rw-r--r--res/values-el/cm_strings.xml37
-rw-r--r--res/values-el/strings.xml12
-rw-r--r--res/values-es/cm_strings.xml37
-rw-r--r--res/values-fr/cm_strings.xml37
-rw-r--r--res/values-fr/strings.xml10
-rw-r--r--res/values-hu/cm_strings.xml37
-rw-r--r--res/values-it/cm_strings.xml37
-rw-r--r--res/values-iw/cm_strings.xml37
-rw-r--r--res/values-iw/strings.xml4
-rw-r--r--res/values-nb/cm_strings.xml37
-rw-r--r--res/values-nl/cm_strings.xml37
-rw-r--r--res/values-pt-rBR/cm_strings.xml37
-rw-r--r--res/values/arrays.xml60
-rw-r--r--res/values/cm_strings.xml38
-rw-r--r--res/values/strings.xml10
-rw-r--r--src/com/android/camera/ActivityBase.java50
-rw-r--r--src/com/android/camera/Camera.java29
-rwxr-xr-xsrc/com/android/camera/VideoCamera.java2
24 files changed, 692 insertions, 30 deletions
diff --git a/Android.mk b/Android.mk
index 69f5fc5..ec46e82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := LegacyCamera
LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic
+LOCAL_REQUIRED_MODULES := libjni_legacymosaic
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ee57c31..1b185c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,15 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.camera"
- android:versionCode="1"
- android:versionName="1"
- >
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.camera">
<original-package android:name="com.android.camera" />
<uses-permission android:name="android.permission.CAMERA" />
- <uses-feature android:name="android.hardware.camera" />
- <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -45,6 +42,14 @@
<action android:name="android.media.action.STILL_IMAGE_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<activity android:name="com.android.camera.VideoCamera"
android:label="@string/video_camera_label"
@@ -74,4 +79,3 @@
</activity>
</application>
</manifest>
-
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
new file mode 100644
index 0000000..968f374
--- /dev/null
+++ b/res/values-af/cm_strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Settings screen, Picture size dialog radio button choices additions-->
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
new file mode 100644
index 0000000..f471365
--- /dev/null
+++ b/res/values-ca/cm_strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (A)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (A)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (A)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (A)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (A)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
new file mode 100644
index 0000000..296372e
--- /dev/null
+++ b/res/values-da/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
new file mode 100644
index 0000000..793c71c
--- /dev/null
+++ b/res/values-de/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5 Megapixel (16:9)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 Megapixel (16:9)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 Megapixel (16:9)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 Megapixel</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5 Megapixel (16:9)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">1080 HD</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5 Megapixel (16:9)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">720 HD</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
new file mode 100644
index 0000000..a7e9900
--- /dev/null
+++ b/res/values-el/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5 MP(W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 MP(W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 MP(W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5 MP(W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD 1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5 MP(W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD 720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 86ca23f..865144e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -19,7 +19,7 @@
<string name="camera_error_title" msgid="6484667504938477337">"Σφάλμα φωτογραφικής μηχανής"</string>
<string name="cannot_connect_camera" msgid="955440687597185163">"Δεν είναι δυνατή η σύνδεση με τη φωτογραφική μηχανή."</string>
<string name="camera_disabled" msgid="8923911090533439312">"Η φωτογραφική μηχανή έχει απενεργοποιηθεί λόγω των πολιτικών ασφαλείας."</string>
- <string name="camera_label" msgid="6346560772074764302">"Φωτογ.μηχανή"</string>
+ <string name="camera_label" msgid="6346560772074764302">"Φωτογραφ. μηχανή"</string>
<string name="video_camera_label" msgid="2899292505526427293">"Βιντεοκάμ."</string>
<string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Εικόνες φωτογραφικής μηχανής"</string>
<string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"Βίντεο φωτογραφικής μηχανής"</string>
@@ -52,11 +52,11 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
- <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 M εικονοστοιχεία"</string>
- <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3M εικονοστοιχεία"</string>
- <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2M εικονοστοιχεία"</string>
- <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1.3M εικονοστοιχεία"</string>
- <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1M εικονοστοιχεία"</string>
+ <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 MP"</string>
+ <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 MP"</string>
+ <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"UXGA"</string>
+ <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"SXGA(4:3)"</string>
+ <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"XGA"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Λειτουργία εστίασης"</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 0000000..c6a0aa8
--- /dev/null
+++ b/res/values-es/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 Mpx</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 Mpx</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6,5 Mpx (pano)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 Mpx (pano)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 Mpx (pano)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 Mpx</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 Mpx</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2,5 Mpx (pano)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1,5 Mpx (pano)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
new file mode 100644
index 0000000..ff9b287
--- /dev/null
+++ b/res/values-fr/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 Mpx</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 Mpx</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 Mpx</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5 Mpx(W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 Mpx(W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 Mpx(W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 Mpx</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 Mpx</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5 Mpx(W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5 Mpx(W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5952cba..f4260a3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -52,11 +52,11 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres appareil photo"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
- <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 M pixels"</string>
- <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 M pixels"</string>
- <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 M pixels"</string>
- <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 M pixels"</string>
- <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 M pixels"</string>
+ <string name="pref_camera_picturesize_entry_2592x1936" msgid="6980117304679164339">"5 Mpx"</string>
+ <string name="pref_camera_picturesize_entry_2048x1536" msgid="4391030755438075447">"3 Mpx"</string>
+ <string name="pref_camera_picturesize_entry_1600x1200" msgid="8081839485457681369">"2 Mpx"</string>
+ <string name="pref_camera_picturesize_entry_1280x960" msgid="7820672028447972964">"1,3 Mpx"</string>
+ <string name="pref_camera_picturesize_entry_1024x768" msgid="3705686683403524018">"1 Mpx"</string>
<string name="pref_camera_picturesize_entry_640x480" msgid="5557572917973022995">"VGA"</string>
<string name="pref_camera_picturesize_entry_320x240" msgid="5729711026478753025">"QVGA"</string>
<string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Mise au point"</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
new file mode 100644
index 0000000..15390a2
--- /dev/null
+++ b/res/values-hu/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD 1080p</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD 720p</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 0000000..9a182d7
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6,5 MP (pano)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 MP (pano)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 MP (pano)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2,5 MP (pano)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1,5 MP (pano)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
new file mode 100644
index 0000000..a99b4bc
--- /dev/null
+++ b/res/values-iw/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5 מגה פיקסלים(רחב)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 מגה פיקסלים(רחב)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 מגה פיקסלים(רחב)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 מגה פיקסלים</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5 מגה פיקסלים(רחב)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5 מגה פיקסלים(רחב)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index af73e69..74c3f20 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -44,7 +44,7 @@
<string name="pref_camera_id_title" msgid="6023059405578511534">"בחר מצלמה"</string>
<string name="pref_camera_id_entry_back" msgid="5142699735103692485">"הקודם"</string>
<string name="pref_camera_id_entry_front" msgid="5668958706828733669">"חזיתית"</string>
- <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"מיקום אחסון"</string>
+ <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"שמירת מיקום"</string>
<string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"כבוי"</string>
<string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"מופעל"</string>
<string name="pref_video_quality_title" msgid="8245379279801096922">"איכות סרטון"</string>
@@ -63,7 +63,7 @@
<string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"אוטומטי"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"אינסוף"</string>
<string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"מאקרו"</string>
- <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"מצב Flash"</string>
+ <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"מצב מבזק"</string>
<string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"אוטומטי"</string>
<string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"מופעל"</string>
<string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"כבוי"</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
new file mode 100644
index 0000000..0bad93b
--- /dev/null
+++ b/res/values-nb/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
new file mode 100644
index 0000000..15390a2
--- /dev/null
+++ b/res/values-nl/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12 MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10 MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8 MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4 MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD 1080p</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1,5 MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD 720p</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
new file mode 100644
index 0000000..e0803fc
--- /dev/null
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources> \ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1180e9b..1b86fb6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -83,30 +83,90 @@
late for the translation. Since we show the same label as the
second item, we just use the second one instead.
-->
+ <item>@string/pref_camera_picturesize_entry_4128x3096</item>
+ <item>@string/pref_camera_picturesize_entry_4000x3000</item>
+ <item>@string/pref_camera_picturesize_entry_4000x3000</item>
+ <item>@string/pref_camera_picturesize_entry_4128x2322</item>
+ <item>@string/pref_camera_picturesize_entry_4000x2250</item>
+ <item>@string/pref_camera_picturesize_entry_4000x2250</item>
+ <item>@string/pref_camera_picturesize_entry_3264x2448</item>
+ <item>@string/pref_camera_picturesize_entry_3264x1968</item>
+ <item>@string/pref_camera_picturesize_entry_3264x1952</item>
<item>@string/pref_camera_picturesize_entry_2592x1936</item>
<item>@string/pref_camera_picturesize_entry_2592x1936</item>
<item>@string/pref_camera_picturesize_entry_2592x1936</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1936</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1936</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+ <item>@string/pref_camera_picturesize_entry_2592x1552</item>
+ <item>@string/pref_camera_picturesize_entry_2560x1712</item>
+ <item>@string/pref_camera_picturesize_entry_2304x1728</item>
<item>@string/pref_camera_picturesize_entry_2048x1536</item>
+ <item>@string/pref_camera_picturesize_entry_2048x1216</item>
+ <item>@string/pref_camera_picturesize_entry_2048x1216</item>
+ <item>@string/pref_camera_picturesize_entry_1920x1080</item>
+ <item>@string/pref_camera_picturesize_entry_1920x1080</item>
<item>@string/pref_camera_picturesize_entry_1600x1200</item>
+ <item>@string/pref_camera_picturesize_entry_1600x1200</item>
+ <item>@string/pref_camera_picturesize_entry_1600x960</item>
<item>@string/pref_camera_picturesize_entry_1280x960</item>
+ <item>@string/pref_camera_picturesize_entry_1280x1024</item>
+ <item>@string/pref_camera_picturesize_entry_1280x768</item>
+ <item>@string/pref_camera_picturesize_entry_1280x720</item>
<item>@string/pref_camera_picturesize_entry_1024x768</item>
+ <item>@string/pref_camera_picturesize_entry_800x600</item>
+ <item>@string/pref_camera_picturesize_entry_800x480</item>
<item>@string/pref_camera_picturesize_entry_640x480</item>
+ <item>@string/pref_camera_picturesize_entry_352x288</item>
<item>@string/pref_camera_picturesize_entry_320x240</item>
+ <item>@string/pref_camera_picturesize_entry_176x144</item>
</string-array>
<!-- When launching the camera app first time, we will set the picture
size to the first one in the list that is also supported by the
driver -->
<string-array name="pref_camera_picturesize_entryvalues" translatable="false">
+ <item>4128x3096</item>
+ <item>4000x3000</item>
+ <item>4128x2322</item>
+ <item>3920x2940</item>
+ <item>4000x2250</item>
+ <item>3920x2204</item>
+ <item>3264x2448</item>
+ <item>3264x1968</item>
+ <item>3264x1952</item>
<item>2592x1944</item>
<item>2592x1936</item>
<item>2560x1920</item>
+ <item>2592x1952</item>
+ <item>2592x1944</item>
+ <item>2592x1552</item>
+ <item>2592x1458</item>
+ <item>2592x1456</item>
+ <item>2560x1536</item>
+ <item>2560x1712</item>
+ <item>2304x1728</item>
<item>2048x1536</item>
+ <item>2048x1216</item>
+ <item>2048x1232</item>
+ <item>1920x1080</item>
+ <item>1920x1088</item>
<item>1600x1200</item>
+ <item>1632x1224</item>
+ <item>1600x960</item>
<item>1280x960</item>
+ <item>1280x1024</item>
+ <item>1280x768</item>
+ <item>1280x720</item>
<item>1024x768</item>
+ <item>800x600</item>
+ <item>800x480</item>
<item>640x480</item>
+ <item>352x288</item>
<item>320x240</item>
+ <item>176x144</item>
</string-array>
<!-- Camera Preferences focus mode dialog box entries -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
new file mode 100644
index 0000000..968f374
--- /dev/null
+++ b/res/values/cm_strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012-2013 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Settings screen, Picture size dialog radio button choices additions-->
+ <string name="pref_camera_picturesize_entry_4128x3096">13MP</string>
+ <string name="pref_camera_picturesize_entry_4000x3000">12MP</string>
+ <string name="pref_camera_picturesize_entry_4128x2322">10MP</string>
+ <string name="pref_camera_picturesize_entry_4000x2250">9MP</string>
+ <string name="pref_camera_picturesize_entry_3264x2448">8MP</string>
+ <string name="pref_camera_picturesize_entry_3264x1968">6.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_3264x1952">6MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2592x1552">4MP (W)</string>
+ <string name="pref_camera_picturesize_entry_2560x1712">4MP</string>
+ <string name="pref_camera_picturesize_entry_2304x1728">4MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1216">2.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1920x1080">HD1080</string>
+ <string name="pref_camera_picturesize_entry_1600x960">1.5MP (W)</string>
+ <string name="pref_camera_picturesize_entry_1280x1024">SXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x768">WXGA</string>
+ <string name="pref_camera_picturesize_entry_1280x720">HD720</string>
+ <string name="pref_camera_picturesize_entry_800x600">SVGA</string>
+ <string name="pref_camera_picturesize_entry_800x480">WVGA</string>
+ <string name="pref_camera_picturesize_entry_352x288">CIF</string>
+ <string name="pref_camera_picturesize_entry_176x144">QCIF</string>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a10af2..7061029 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -138,11 +138,11 @@
<string name="pref_camera_picturesize_title">Picture size</string>
<!-- Settings screen, Picture size dialog radio button choices -->
- <string name="pref_camera_picturesize_entry_2592x1936">5M pixels</string>
- <string name="pref_camera_picturesize_entry_2048x1536">3M pixels</string>
- <string name="pref_camera_picturesize_entry_1600x1200">2M pixels</string>
- <string name="pref_camera_picturesize_entry_1280x960">1.3M pixels</string>
- <string name="pref_camera_picturesize_entry_1024x768">1M pixels</string>
+ <string name="pref_camera_picturesize_entry_2592x1936">5MP</string>
+ <string name="pref_camera_picturesize_entry_2048x1536">3MP</string>
+ <string name="pref_camera_picturesize_entry_1600x1200">2MP</string>
+ <string name="pref_camera_picturesize_entry_1280x960">1.3MP</string>
+ <string name="pref_camera_picturesize_entry_1024x768">1MP</string>
<string name="pref_camera_picturesize_entry_640x480">VGA</string>
<string name="pref_camera_picturesize_entry_320x240">QVGA</string>
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index e399421..4a29469 100644
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -20,13 +20,16 @@ import com.android.camera.ui.PopupManager;
import android.app.Activity;
import android.app.KeyguardManager;
+import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.hardware.Camera;
import android.os.Bundle;
import android.util.Log;
import android.view.KeyEvent;
+import android.view.WindowManager;
/**
* Superclass of Camera and VideoCamera activities.
@@ -38,6 +41,11 @@ abstract public class ActivityBase extends Activity {
private boolean mOnResumePending;
private Intent mResultDataForTesting;
protected Camera mCameraDevice;
+ // settings for lock screen camera
+ protected static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE =
+ "android.media.action.STILL_IMAGE_CAMERA_SECURE";
+ protected static final String ACTION_IMAGE_CAPTURE_SECURE =
+ "android.media.action.IMAGE_CAPTURE_SECURE";
@Override
public void onCreate(Bundle icicle) {
@@ -47,6 +55,18 @@ abstract public class ActivityBase extends Activity {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
super.onCreate(icicle);
+
+ if(isCameraSecure()){
+ Log.v(TAG, "Starting in secure camera mode.");
+
+ // show on lock screen
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+
+ // Filter for screen off so that we can finish secure camera activity
+ // when screen is off.
+ IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
+ registerReceiver(mScreenOffReceiver, filter);
+ }
}
@Override
@@ -62,6 +82,7 @@ abstract public class ActivityBase extends Activity {
@Override
protected void onResume() {
super.onResume();
+ onResumeAfterSuper();
// Don't grab the camera if in use by lockscreen. For example, face
// unlock may be using the camera. Camera may be already opened in
// onCreate. doOnResume should continue if mCameraDevice != null.
@@ -127,11 +148,14 @@ abstract public class ActivityBase extends Activity {
@Override
protected void onDestroy() {
+ if (isCameraSecure()) {
+ unregisterReceiver(mScreenOffReceiver);
+ }
PopupManager.removeInstance(this);
super.onDestroy();
}
- private boolean isKeyguardLocked() {
+ protected boolean isKeyguardLocked() {
KeyguardManager kgm = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
if (LOGV) {
if (kgm != null) {
@@ -142,4 +166,28 @@ abstract public class ActivityBase extends Activity {
// isKeyguardSecure excludes the slide lock case.
return (kgm != null) && kgm.isKeyguardLocked() && kgm.isKeyguardSecure();
}
+
+ protected boolean isCameraSecure() {
+ // Check if this is in the secure camera mode.
+ String action = getIntent().getAction();
+ if (INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(action)
+ || ACTION_IMAGE_CAPTURE_SECURE.equals(action)){
+ return true;
+ }
+ else{
+ return isKeyguardLocked();
+ }
+ }
+
+ // close activity when screen turns off
+ protected BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ Log.v(TAG, "Finishing because screen turned off.");
+ finish();
+ }
+ };
+
+ // implemented in class Camera, class Video needs empty one
+ public void onResumeAfterSuper() {};
}
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index b50ab18..254db28 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -100,6 +100,10 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
private static final int SHOW_TAP_TO_FOCUS_TOAST = 6;
private static final int UPDATE_THUMBNAIL = 7;
+ // This is the delay before we execute onResume tasks when coming
+ // from the lock screen, to allow time for onPause to execute.
+ private static final int ON_RESUME_TASKS_DELAY_MSEC = 20;
+
// The subset of parameters we need to update in setCameraParameters().
private static final int UPDATE_PARAM_INITIALIZE = 1;
private static final int UPDATE_PARAM_ZOOM = 2;
@@ -1358,7 +1362,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
@OnClickAttr
public void onThumbnailClicked(View v) {
- if (isCameraIdle() && mThumbnail != null) {
+ if (isCameraIdle() && mThumbnail != null && !isCameraSecure()) {
showSharePopup();
}
}
@@ -2331,4 +2335,27 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
mAeLockSupported = mInitialParams.isAutoExposureLockSupported();
mAwbLockSupported = mInitialParams.isAutoWhiteBalanceLockSupported();
}
+
+ @Override
+ public void onResumeAfterSuper() {
+ // Add delay on resume from lock screen only, in order to to speed up
+ // the onResume --> onPause --> onResume cycle from lock screen.
+ // Don't do always because letting go of thread can cause delay.
+ String action = getIntent().getAction();
+ if (isCameraSecure()) {
+ Log.v(TAG, "On resume, from lock screen.");
+ // Note: onPauseAfterSuper() will delete this runnable, so we will
+ // at most have 1 copy queued up.
+ mHandler.postDelayed(new Runnable() {
+ public void run() {
+ doOnResume();
+ }
+ }, ON_RESUME_TASKS_DELAY_MSEC);
+ // show on lock screen
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ } else {
+ Log.v(TAG, "On resume.");
+ doOnResume();
+ }
+ }
}
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index b2626ed..2190c48 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -608,7 +608,7 @@ public class VideoCamera extends ActivityBase
@OnClickAttr
public void onThumbnailClicked(View v) {
- if (!mMediaRecorderRecording && mThumbnail != null) {
+ if (!mMediaRecorderRecording && mThumbnail != null && !isCameraSecure()) {
showSharePopup();
}
}
generated by cgit v1.1 at 2024-12-22 03:28:01 +0000