SnapdragonCamera: Scene mode change

Adding Sharpshooter, Stillmore scene mode menu
Moving Tracking focus to the scene mode

Change-Id: I5afb2499e767d90f0e0e6408168961bcda4e55bb
CRs-Fixed: 1083651

6 files changed, 8 insertions, 15 deletions

diff --git a/res/drawable-hdpi/sharp_photo.png b/res/drawable-hdpi/sharp_photo.png
new file mode 100644
index 000000000..3730e7247
--- /dev/null
+++ b/res/drawable-hdpi/sharp_photo.png
diff --git a/res/drawable-hdpi/tracking_focus.png b/res/drawable-hdpi/tracking_focus.png
new file mode 100644
index 000000000..7ab23eb05
--- /dev/null
+++ b/res/drawable-hdpi/tracking_focus.png
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 5bb98d2eb..80c695d58 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -154,6 +154,8 @@
         <item>103</item>
         <item>105</item>
         <item>106</item>
+        <item>107</item>
+        <item>108</item>
         <item>104</item>
     </string-array>
 
@@ -178,6 +180,8 @@
         <item>@string/pref_camera_scenemode_entry_bestpicture</item>
         <item>@string/pref_camera_scenemode_entry_chromaflash</item>
         <item>@string/pref_camera_scenemode_entry_blurbuster</item>
+        <item>@string/pref_camera_scenemode_entry_sharpshooter</item>
+        <item>@string/pref_camera_scenemode_entry_trackingfocus</item>
         <item>@string/pref_camera_scenemode_entry_panorama</item>
     </string-array>
 
@@ -201,6 +205,8 @@
         <item>@drawable/pick_the_best_photo</item>
         <item>@drawable/chroma_flash</item>
         <item>@drawable/blur_buster</item>
+        <item>@drawable/sharp_photo</item>
+        <item>@drawable/tracking_focus</item>
         <item>@drawable/scene_panorama</item>
     </array>
 
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 64bd8127a..34c9b32cf 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1026,6 +1026,8 @@
     <string name="pref_camera_scenemode_entry_bestpicture" translatable="true">BestPicture</string>
     <string name="pref_camera_scenemode_entry_chromaflash" translatable="true">ChromaFlash</string>
     <string name="pref_camera_scenemode_entry_blurbuster" translatable="true">BlurBuster</string>
+    <string name="pref_camera_scenemode_entry_sharpshooter" translatable="true">SharpPhoto</string>
+    <string name="pref_camera_scenemode_entry_trackingfocus" translatable="true">TrackingFocus</string>
     <string name="pref_camera_scenemode_entry_panorama" translatable="true">Panorama</string>
     <string name="bestpicture_done" translatable="true">DONE</string>
     <string name="bestpicture_at_least_one_picture" translatable="true">At least, one picture has to be chosen.</string>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 07c3df83e..f3603c443 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -270,13 +270,6 @@
         camera:singleIcon="@drawable/ic_settings_facerec"
         camera:title="@string/pref_camera_facedetection_title"/>
 
-    <ListPreference
-        camera:defaultValue="off"
-        camera:key="pref_camera2_trackingfocus_key"
-        camera:entries="@array/pref_camera2_trackingfocus_entries"
-        camera:entryValues="@array/pref_camera2_trackingfocus_entryvalues"
-        camera:title="@string/pref_camera2_trackingfocus_title"/>
-
     <IconListPreference
         camera:defaultValue="@string/pref_camera_hfr_default"
         camera:entries="@array/pref_camera_hfr_entries"
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index ba140f4ff..92b5db8c8 100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -252,13 +252,6 @@
             android:layout="@layout/preference"
             android:summary="%s"
             android:title="@string/pref_camera_hfr_title" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:icon="@drawable/tracking_focus"
-            android:key="pref_camera2_trackingfocus_key"
-            android:layout="@layout/preference"
-            android:title="@string/pref_camera2_trackingfocus_title" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -271,7 +264,6 @@
             android:key="pref_camera2_restore_default_key"
             android:layout="@layout/preference"
             android:title="@string/pref_camera2_restore_default" />
-
         <Preference
             android:defaultValue="false"
             android:icon="@drawable/version_info"