diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-08-21 00:46:28 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-08-21 18:46:32 -0700 |
| commit | 7b6b27b86db2c5b813b278806a36f60e219a7a0d (patch) | |
| tree | 56d31ebf2ea0ed6420616aa5c4b0352b5dc05ef5 | |
| parent | b0068ff9e0b350b3b2189996bb08f3fdf00d59e4 (diff) | |
| download | android_packages_apps_Snap-7b6b27b86db2c5b813b278806a36f60e219a7a0d.tar.gz android_packages_apps_Snap-7b6b27b86db2c5b813b278806a36f60e219a7a0d.tar.bz2 android_packages_apps_Snap-7b6b27b86db2c5b813b278806a36f60e219a7a0d.zip | |
camera2: Merge fixes
Change-Id: I1a69682fa0e1beb393d3e6d64812bab0bf7b68ad
| -rw-r--r-- | res/drawable-hdpi/ic_settings_filter_on.png | bin | 0 -> 2311 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_settings_filter_on.png | bin | 0 -> 2731 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_settings_filter_on.png | bin | 0 -> 3301 bytes | |||
| -rw-r--r-- | res/values/strings.xml | 6 |
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 Binary files differnew file mode 100644 index 000000000..32835f907 --- /dev/null +++ b/res/drawable-hdpi/ic_settings_filter_on.png diff --git a/res/drawable-xhdpi/ic_settings_filter_on.png b/res/drawable-xhdpi/ic_settings_filter_on.png Binary files differnew file mode 100644 index 000000000..c1e518e33 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_filter_on.png diff --git a/res/drawable-xxhdpi/ic_settings_filter_on.png b/res/drawable-xxhdpi/ic_settings_filter_on.png Binary files differnew file mode 100644 index 000000000..048c08772 --- /dev/null +++ b/res/drawable-xxhdpi/ic_settings_filter_on.png diff --git a/res/values/strings.xml b/res/values/strings.xml index ddadda6e2..00fbb855b 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> |
