summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAbhijit Trivedi <abhijitt@codeaurora.org>2017-11-11 14:21:45 -0800
committerxianming wang <mingwax@codeaurora.org>2017-11-12 15:23:26 +0800
commit067d85f08851d08994d4a83865529d88cb6c333e (patch)
treec7e8a9242c863bd0fa6702f5ac6a831c6b747c29 /res/values
parenta76e01760ed7bc7d91b7831074c369cfeddd7f09 (diff)
downloadandroid_packages_apps_Snap-067d85f08851d08994d4a83865529d88cb6c333e.tar.gz
android_packages_apps_Snap-067d85f08851d08994d4a83865529d88cb6c333e.tar.bz2
android_packages_apps_Snap-067d85f08851d08994d4a83865529d88cb6c333e.zip
Revert latest SnapdragonCamera Promotion
reverts commit db126f27692565bba5f45f0523df6449e1654ba2. reverts commit 85076fda04296ed1ba8f41bf1f5bdb4e56716749. Change-Id: Idc8dffc562d09a3e6369121465e1c8cd352d9979
Diffstat (limited to 'res/values')
-rwxr-xr-xres/values/camera2arrays.xml5
-rwxr-xr-xres/values/qcomstrings.xml1
2 files changed, 0 insertions, 6 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 0f54c290e..014a4820e 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -158,7 +158,6 @@
<item>108</item>
<item>104</item>
<item>109</item>
- <item>110</item>
</string-array>
<!-- Camera Preferences Scene Mode dialog box entries -->
@@ -186,7 +185,6 @@
<item>@string/pref_camera_scenemode_entry_trackingfocus</item>
<item>@string/pref_camera_scenemode_entry_panorama</item>
<item>@string/pref_camera_scenemode_entry_promode</item>
- <item>@string/pref_camera_scenemode_entry_deepzoom</item>
</string-array>
<array name="pref_camera2_scenemode_thumbnails" translatable="false">
@@ -213,7 +211,6 @@
<item>@drawable/tracking_focus</item>
<item>@drawable/scene_panorama</item>
<item>@drawable/promode</item>
- <item>@drawable/sharp_photo</item>
</array>
<array name="pref_camera2_scenemode_black_thumbnails" translatable="false">
@@ -240,7 +237,6 @@
<item>@drawable/ic_scene_mode_black_tracking_focus</item>
<item>@drawable/ic_scene_mode_black_panorama</item>
<item>@drawable/ic_scene_mode_black_dual_camera</item>
- <item>@drawable/ic_scene_mode_black_sharp_photo</item>
</array>
<!-- Camera Preferences Scene Mode dialog box entries -->
@@ -268,7 +264,6 @@
<item>@string/pref_camera2_scene_mode_tracking_focus_instructional_content</item>
<item>@string/pref_camera2_scene_mode_panorama_instructional_content</item>
<item>@string/pref_camera2_scene_mode_pro_instructional_content</item>
- <item>""</item>
</string-array>
<string-array name="pref_camera2_whitebalance_entryvalues" translatable="false">
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 80ccfa1ad..1290b5ca4 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1030,7 +1030,6 @@
<string name="pref_camera_scenemode_entry_trackingfocus" translatable="true">TrackingFocus</string>
<string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string>
<string name="pref_camera_scenemode_entry_promode" translatable="true">ProMode</string>
- <string name="pref_camera_scenemode_entry_deepzoom" translatable="true">DeepZoom</string>
<string name="bestpicture_done" translatable="true">SAVE</string>
<string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>