summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-08-21 00:46:28 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-25 21:55:20 -0700
commitb951369e7c45fac91bff19b1c5e64ea00d1f7825 (patch)
treeb96887dda15e1be6809b86688d61d3433776f65a
parentec8173bc779d50a81aefead62798090bab2b254e (diff)
downloadandroid_packages_apps_Snap-b951369e7c45fac91bff19b1c5e64ea00d1f7825.zip
android_packages_apps_Snap-b951369e7c45fac91bff19b1c5e64ea00d1f7825.tar.gz
android_packages_apps_Snap-b951369e7c45fac91bff19b1c5e64ea00d1f7825.tar.bz2
camera2: Merge fixes
Change-Id: I1a69682fa0e1beb393d3e6d64812bab0bf7b68ad
-rw-r--r--res/drawable-hdpi/ic_settings_filter_on.pngbin0 -> 2311 bytes
-rw-r--r--res/drawable-xhdpi/ic_settings_filter_on.pngbin0 -> 2731 bytes
-rw-r--r--res/drawable-xxhdpi/ic_settings_filter_on.pngbin0 -> 3301 bytes
-rw-r--r--res/values/strings.xml6
4 files changed, 0 insertions, 6 deletions
diff --git a/res/drawable-hdpi/ic_settings_filter_on.png b/res/drawable-hdpi/ic_settings_filter_on.png
new file mode 100644
index 0000000..32835f9
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_filter_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_filter_on.png b/res/drawable-xhdpi/ic_settings_filter_on.png
new file mode 100644
index 0000000..c1e518e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_filter_on.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_filter_on.png b/res/drawable-xxhdpi/ic_settings_filter_on.png
new file mode 100644
index 0000000..048c087
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_filter_on.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ddadda6..00fbb85 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -391,12 +391,6 @@
<!-- Toast after High Quality Noise Reduction has been enabled to show TNR is disabled -->
<string name="disable_TNR_during_HighQualityNoiseReduction">High Quality Noise Reduction will disable TNR</string>
- <!-- Toast after SeeMore has been enabled to show CDS is disabled -->
- <string name="disable_CDS_during_SeeMore">SeeMore will disable CDS.</string>
-
- <!-- Toast after SeeMore has been enabled to show TNR is disabled -->
- <string name="disable_TNR_during_SeeMore">SeeMore will disable TNR.</string>
-
<!-- Exposure settings in preference -->
<string name="pref_exposure_title">Exposure</string>
<string name="pref_exposure_default" translatable="false">0</string>