summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-12-22 22:27:33 +0000
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-16 02:39:17 +0200
commita676e15c3728422f31970dce3f60e74bfc9c9e60 (patch)
treef297d7c8148e51c7a6e97e2e74e506529648f758 /res/values
parent44cfc318abd5ffaca40b88215e5f2834c4b1bf68 (diff)
downloadandroid_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.tar.gz
android_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.tar.bz2
android_packages_apps_Snap-a676e15c3728422f31970dce3f60e74bfc9c9e60.zip
Revert "Camera: Propagate power mode selection from UI to lower layers."
This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime power-mode changes are causing stability issues in camcorder Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2 Revert "SnapdragonCamera: Disable LPM if DIS/Flip are enabled." This reverts commit 6cd860119a45b4a44d3e1314981862d9dac47955. Revert "SnapdragonCamera: Set low power mode by default." This reverts commit d4fccc04331a6a5a7038a542f7d17ecefa4ac95a. Revert "SnapdragonCamera: Enable low power mode in Camera." This reverts commit 195fccbe69e92b0312822aa762bb53d301c0f56f. Change-Id: I623626e60efc850fe182e54d9e9997ca41275579 [mikeioannina]: Remove the now obsolete power mode setting and unhide the video snapshot size setting Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2
Diffstat (limited to 'res/values')
-rw-r--r--res/values/qcomarrays.xml11
-rw-r--r--res/values/qcomstrings.xml7
2 files changed, 0 insertions, 18 deletions
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 48e6e463d..3605ec9e5 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -22,17 +22,6 @@
<resources>
<!-- Preferences -->
- <!-- Power mode -->
- <string-array name="pref_camera_powermode_entries" translatable="false">
- <item>@string/pref_camera_powermode_entry_lp</item>
- <item>@string/pref_camera_powermode_entry_np</item>
- </string-array>
-
- <string-array name="pref_camera_powermode_entryvalues" translatable="false">
- <item>Low_Power</item>
- <item>Normal_Power</item>
- </string-array>
-
<!-- Picture format -->
<string-array name="pref_camera_picture_format_entries" translatable="false">
<item>@string/pref_camera_picture_format_entry_jpeg</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 3eec7fe41..78fa98c9b 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -33,13 +33,6 @@
<string name="pref_camera_videosnapsize_default" translatable="false">1920x1080</string>
- <!-- Power mode -->
- <string name="pref_camera_powermode_title">Power mode</string>
- <string name="pref_camera_powermode_default" translatable="false">Normal_Power</string>
-
- <string name="pref_camera_powermode_entry_lp">Low power</string>
- <string name="pref_camera_powermode_entry_np">Normal</string>
-
<!-- Auto exposure -->
<string name="pref_camera_autoexposure_title">Auto exposure</string>
<string name="pref_camera_autoexposure_default" translatable="false">frame-average</string>