summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorweijiew <weijiew@codeaurora.org>2016-12-23 16:19:43 +0800
committerweijiew <weijiew@codeaurora.org>2016-12-23 17:01:48 +0800
commit8815dd2a2fdf3a778099a5f5c14d334cc72b6ff8 (patch)
tree84a47db915de53ed40e39c1a22b8d86abe256c23 /res
parentd92a952b0cfe8e570f85112bc9a4c65729e7ffed (diff)
downloadandroid_packages_apps_Snap-8815dd2a2fdf3a778099a5f5c14d334cc72b6ff8.tar.gz
android_packages_apps_Snap-8815dd2a2fdf3a778099a5f5c14d334cc72b6ff8.tar.bz2
android_packages_apps_Snap-8815dd2a2fdf3a778099a5f5c14d334cc72b6ff8.zip
SnapdragonCamera: Add features to developer option
Description: 1、Add Histogram support to developer option 2、Add HDR & Non-HDR support to developer option 3、Add Saturation Level support to developer option 4、Add Anti Banding support to developer option Change-Id: I2db7e1be65a6b3ee04ebc46cb214dc1cc9667fc6 CRs-Fixed: 1103649
Diffstat (limited to 'res')
-rw-r--r--[-rwxr-xr-x]res/layout/capture_module.xml28
-rw-r--r--[-rwxr-xr-x]res/values/camera2arrays.xml72
-rw-r--r--[-rwxr-xr-x]res/values/qcomstrings.xml36
-rw-r--r--[-rwxr-xr-x]res/xml/capture_preferences.xml28
-rw-r--r--[-rwxr-xr-x]res/xml/setting_menu_preferences.xml40
5 files changed, 204 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 44d5c59c6..82249f42d 100755..100644
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -60,6 +60,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
+ <com.android.camera.Camera2GraphView
+ android:id="@+id/graph_view_r"
+ android:visibility="gone"
+ android:layout_width="100dip"
+ android:layout_height="100dip"
+ android:layout_marginTop="70dip"
+ android:layout_marginLeft="10dip" />
+ <com.android.camera.Camera2GraphView
+ android:id="@+id/graph_view_gr"
+ android:visibility="gone"
+ android:layout_width="100dip"
+ android:layout_height="100dip"
+ android:layout_marginTop="70dip"
+ android:layout_marginLeft="120dip" />
+ <com.android.camera.Camera2GraphView
+ android:id="@+id/graph_view_gb"
+ android:visibility="gone"
+ android:layout_width="100dip"
+ android:layout_height="100dip"
+ android:layout_marginTop="70dip"
+ android:layout_marginLeft="230dip" />
+ <com.android.camera.Camera2GraphView
+ android:id="@+id/graph_view_b"
+ android:visibility="gone"
+ android:layout_width="100dip"
+ android:layout_height="100dip"
+ android:layout_marginTop="180dip"
+ android:layout_marginLeft="10dip" />
</FrameLayout>
<com.android.camera.ui.RenderOverlay
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index ca6234944..204638ccc 100755..100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -958,4 +958,76 @@ for time lapse recording -->
<item>@string/pref_camera2_instant_aec_entry_aggressive</item>
<item>@string/pref_camera2_instant_aec_entry_fast</item>
</string-array>
+
+ <string-array name="pref_camera2_anti_banding_level_entryvalues" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ </string-array>
+
+ <string-array name="pref_camera2_anti_banding_level_entries" translatable="true">
+ <item>@string/pref_camera2_anti_banding_level_entry_off</item>
+ <item>@string/pref_camera2_anti_banding_level_entry_50hz</item>
+ <item>@string/pref_camera2_anti_banding_level_entry_60hz</item>
+ <item>@string/pref_camera2_anti_banding_level_entry_auto</item>
+ </string-array>
+
+ <string-array name="pref_camera2_saturation_level_entryvalues" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ <item>4</item>
+ <item>5</item>
+ <item>6</item>
+ <item>7</item>
+ <item>8</item>
+ <item>9</item>
+ <item>10</item>
+ </string-array>
+
+ <string-array name="pref_camera2_saturation_level_entries" translatable="true">
+ <item>@string/pref_camera2_saturation_level_entry_0</item>
+ <item>@string/pref_camera2_saturation_level_entry_1</item>
+ <item>@string/pref_camera2_saturation_level_entry_2</item>
+ <item>@string/pref_camera2_saturation_level_entry_3</item>
+ <item>@string/pref_camera2_saturation_level_entry_4</item>
+ <item>@string/pref_camera2_saturation_level_entry_5</item>
+ <item>@string/pref_camera2_saturation_level_entry_6</item>
+ <item>@string/pref_camera2_saturation_level_entry_7</item>
+ <item>@string/pref_camera2_saturation_level_entry_8</item>
+ <item>@string/pref_camera2_saturation_level_entry_9</item>
+ <item>@string/pref_camera2_saturation_level_entry_10</item>
+ </string-array>
+
+ <string-array name="pref_camera2_histogram_entryvalues" translatable="false">
+ <item>enable</item>
+ <item>disable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_histogram_entries" translatable="true">
+ <item>@string/pref_camera2_histogram_entry_enable</item>
+ <item>@string/pref_camera2_histogram_entry_disable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_hdr_entryvalues" translatable="false">
+ <item>enable</item>
+ <item>disable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_hdr_entries" translatable="true">
+ <item>@string/pref_camera2_hdr_entry_enable</item>
+ <item>@string/pref_camera2_hdr_entry_disable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_auto_hdr_entryvalues" translatable="false">
+ <item>enable</item>
+ <item>disable</item>
+ </string-array>
+
+ <string-array name="pref_camera2_auto_hdr_entries" translatable="true">
+ <item>@string/pref_camera2_auto_hdr_entry_enable</item>
+ <item>@string/pref_camera2_auto_hdr_entry_disable</item>
+ </string-array>
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 526e72021..70b211d0a 100755..100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1086,5 +1086,41 @@
<string name="pref_camera2_instant_aec_entry_disable" translatable="true">Disable</string>
<string name="pref_camera2_instant_aec_entry_aggressive" translatable="true">Aggressive AEC</string>
<string name="pref_camera2_instant_aec_entry_fast" translatable="true">Fast AEC</string>
+
+ <string name="pref_camera2_saturation_level_title" translatable="true">Saturation Level</string>
+ <string name="pref_camera2_saturation_level_default" translatable="false">5</string>
+ <string name="pref_camera2_saturation_level_entry_0" translatable="true">Level 0</string>
+ <string name="pref_camera2_saturation_level_entry_1" translatable="true">Level 1</string>
+ <string name="pref_camera2_saturation_level_entry_2" translatable="true">Level 2</string>
+ <string name="pref_camera2_saturation_level_entry_3" translatable="true">Level 3</string>
+ <string name="pref_camera2_saturation_level_entry_4" translatable="true">Level 4</string>
+ <string name="pref_camera2_saturation_level_entry_5" translatable="true">Level 5(Default)</string>
+ <string name="pref_camera2_saturation_level_entry_6" translatable="true">Level 6</string>
+ <string name="pref_camera2_saturation_level_entry_7" translatable="true">Level 7</string>
+ <string name="pref_camera2_saturation_level_entry_8" translatable="true">Level 8</string>
+ <string name="pref_camera2_saturation_level_entry_9" translatable="true">Level 9</string>
+ <string name="pref_camera2_saturation_level_entry_10" translatable="true">Level 10</string>
+
+ <string name="pref_camera2_anti_banding_level_title" translatable="true">Anti Banding Level</string>
+ <string name="pref_camera2_anti_banding_level_default" translatable="false">0</string>
+ <string name="pref_camera2_anti_banding_level_entry_off" translatable="true">Off</string>
+ <string name="pref_camera2_anti_banding_level_entry_50hz" translatable="true">50HZ</string>
+ <string name="pref_camera2_anti_banding_level_entry_60hz" translatable="true">60HZ</string>
+ <string name="pref_camera2_anti_banding_level_entry_auto" translatable="true">Auto</string>
+
+ <string name="pref_camera2_histogram_title" translatable="true">Histogram</string>
+ <string name="pref_camera2_histogram_default" translatable="false">disable</string>
+ <string name="pref_camera2_histogram_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera2_histogram_entry_disable" translatable="true">Disable</string>
+
+ <string name="pref_camera2_hdr_title" translatable="true">HDR &amp; Non-HDR</string>
+ <string name="pref_camera2_hdr_default" translatable="false">disable</string>
+ <string name="pref_camera2_hdr_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera2_hdr_entry_disable" translatable="true">Disable</string>
+
+ <string name="pref_camera2_auto_hdr_title" translatable="true">AUTO HDR</string>
+ <string name="pref_camera2_auto_hdr_default" translatable="false">disable</string>
+ <string name="pref_camera2_auto_hdr_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera2_auto_hdr_entry_disable" translatable="true">Disable</string>
</resources>
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index cab23a027..67893979e 100755..100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -307,4 +307,32 @@
camera:entryValues="@array/pref_camera2_instant_aec_entryvalues"
camera:key="pref_camera2_instant_aec_key"
camera:title="@string/pref_camera2_instant_aec_title" />
+
+ <ListPreference
+ camera:defaultValue="@string/pref_camera2_saturation_level_default"
+ camera:entries="@array/pref_camera2_saturation_level_entries"
+ camera:entryValues="@array/pref_camera2_saturation_level_entryvalues"
+ camera:key="pref_camera2_saturation_level_key"
+ camera:title="@string/pref_camera2_saturation_level_title" />
+
+ <ListPreference
+ camera:defaultValue="@string/pref_camera2_anti_banding_level_default"
+ camera:entries="@array/pref_camera2_anti_banding_level_entries"
+ camera:entryValues="@array/pref_camera2_anti_banding_level_entryvalues"
+ camera:key="pref_camera2_anti_banding_level_key"
+ camera:title="@string/pref_camera2_anti_banding_level_title" />
+
+ <ListPreference
+ camera:defaultValue="@string/pref_camera2_histogram_default"
+ camera:entries="@array/pref_camera2_histogram_entries"
+ camera:entryValues="@array/pref_camera2_histogram_entryvalues"
+ camera:key="pref_camera2_histogram_key"
+ camera:title="@string/pref_camera2_histogram_title" />
+
+ <ListPreference
+ camera:defaultValue="@string/pref_camera2_hdr_default"
+ camera:entries="@array/pref_camera2_hdr_entries"
+ camera:entryValues="@array/pref_camera2_hdr_entryvalues"
+ camera:key="pref_camera2_hdr_key"
+ camera:title="@string/pref_camera2_hdr_title" />
</PreferenceGroup>
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 31e5475c0..94f6fd9f7 100755..100644
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -289,5 +289,45 @@
android:layout="@layout/preference"
android:summary="%s"
android:title="@string/pref_camera2_instant_aec_title" />
+ <ListPreference
+ android:defaultValue="@string/pref_camera2_saturation_level_default"
+ android:entries="@array/pref_camera2_saturation_level_entries"
+ android:entryValues="@array/pref_camera2_saturation_level_entryvalues"
+ android:key="pref_camera2_saturation_level_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_saturation_level_title" />
+ <ListPreference
+ android:defaultValue="@string/pref_camera2_anti_banding_level_default"
+ android:entries="@array/pref_camera2_anti_banding_level_entries"
+ android:entryValues="@array/pref_camera2_anti_banding_level_entryvalues"
+ android:key="pref_camera2_anti_banding_level_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_anti_banding_level_title" />
+ <ListPreference
+ android:defaultValue="@string/pref_camera2_histogram_default"
+ android:entries="@array/pref_camera2_histogram_entries"
+ android:entryValues="@array/pref_camera2_histogram_entryvalues"
+ android:key="pref_camera2_histogram_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_histogram_title" />
+ <ListPreference
+ android:defaultValue="@string/pref_camera2_hdr_default"
+ android:entries="@array/pref_camera2_hdr_entries"
+ android:entryValues="@array/pref_camera2_hdr_entryvalues"
+ android:key="pref_camera2_hdr_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_hdr_title" />
+ <ListPreference
+ android:defaultValue="@string/pref_camera2_auto_hdr_default"
+ android:entries="@array/pref_camera2_auto_hdr_entries"
+ android:entryValues="@array/pref_camera2_auto_hdr_entryvalues"
+ android:key="pref_camera2_auto_hdr_key"
+ android:layout="@layout/preference"
+ android:summary="%s"
+ android:title="@string/pref_camera2_auto_hdr_title" />
</PreferenceCategory>
</PreferenceScreen>