Snap for 4706961 from 8d0074b5e5498afbad51b01df7f2e8eecd8d17ee to pi-release

Change-Id: I239f40af9f299e2a688114eb46bea0967901cfd3

6 files changed, 3 insertions, 875 deletions

diff --git a/Android.mk b/Android.mk
index 68d573a00..34d7cb481 100644
--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 LOCAL_JAVA_LIBRARIES += org.apache.http.legacy
 
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
+
 include $(BUILD_PACKAGE)
 
 ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
diff --git a/jarjar-rules.txt b/jarjar-rules.txt
new file mode 100644
index 000000000..99555e465
--- /dev/null
+++ b/jarjar-rules.txt
@@ -0,0 +1 @@
+rule android.util.Pools** com.android.photos.util.Pools@1
diff --git a/proguard.flags b/proguard.flags
index c8ba2ffad..72cba5158 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -84,5 +84,3 @@
 -keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
 
 
-# TODO: remove or rename android.util.Pools.java from our source.
--dontwarn android.util.Pools*
diff --git a/res/values-as/filtershow_strings.xml b/res/values-as/filtershow_strings.xml
deleted file mode 100644
index 9204bdab9..000000000
--- a/res/values-as/filtershow_strings.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for title_activity_filter_show (2036539130684382763) -->
-    <skip />
-    <!-- no translation found for cannot_load_image (5023634941212959976) -->
-    <skip />
-    <!-- no translation found for cannot_edit_original (5890293845882609388) -->
-    <skip />
-    <!-- no translation found for original_picture_text (3076213290079909698) -->
-    <skip />
-    <!-- no translation found for setting_wallpaper (4679087092300036632) -->
-    <skip />
-    <!-- no translation found for download_failure (5923323939788582895) -->
-    <skip />
-    <!-- no translation found for original (3524493791230430897) -->
-    <skip />
-    <!-- no translation found for borders (2067345080568684614) -->
-    <!-- no translation found for borders (4461692156695893616) -->
-    <skip />
-    <!-- no translation found for custom_border (8679893731790931871) -->
-    <skip />
-    <!-- no translation found for filtershow_undo (6781743189243585101) -->
-    <skip />
-    <!-- no translation found for filtershow_redo (4219489910543059747) -->
-    <skip />
-    <!-- no translation found for show_imagestate_panel (281932769701043015) -->
-    <skip />
-    <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
-    <skip />
-    <!-- no translation found for export_image (3202835713172222134) -->
-    <skip />
-    <!-- no translation found for print_image (1942989216591621413) -->
-    <skip />
-    <!-- no translation found for export_flattened (9046192331465915411) -->
-    <skip />
-    <!-- no translation found for select_output_settings (1268532018080310748) -->
-    <skip />
-    <!-- no translation found for quality (179292110309050529) -->
-    <skip />
-    <!-- no translation found for size (4639404642236356037) -->
-    <skip />
-    <!-- no translation found for x (6810256999024563662) -->
-    <skip />
-    <!-- no translation found for menu_settings (6428291655769260831) -->
-    <skip />
-    <!-- no translation found for unsaved (8704442449002374375) -->
-    <skip />
-    <!-- no translation found for save_before_exit (2680660633675916712) -->
-    <skip />
-    <!-- no translation found for save_and_exit (3628425023766687419) -->
-    <skip />
-    <!-- no translation found for save_and_processing (6371565035837463194) -->
-    <skip />
-    <!-- no translation found for exit (242642957038770113) -->
-    <skip />
-    <!-- no translation found for history (455767361472692409) -->
-    <skip />
-    <!-- no translation found for reset (9013181350779592937) -->
-    <skip />
-    <!-- no translation found for history_original (150973253194312841) -->
-    <skip />
-    <!-- no translation found for imageState (8632586742752891968) -->
-    <skip />
-    <!-- no translation found for compare_original (8140838959007796977) -->
-    <skip />
-    <!-- no translation found for apply_effect (1218288221200568947) -->
-    <skip />
-    <!-- no translation found for reset_effect (7712605581024929564) -->
-    <skip />
-    <!-- no translation found for aspect (4025244950820813059) -->
-    <skip />
-    <!-- no translation found for aspect1to1_effect (1159104543795779123) -->
-    <skip />
-    <!-- no translation found for aspect4to3_effect (7968067847241223578) -->
-    <skip />
-    <!-- no translation found for aspect3to4_effect (7078163990979248864) -->
-    <skip />
-    <!-- no translation found for aspect4to6_effect (1410129351686165654) -->
-    <skip />
-    <!-- no translation found for aspect5to7_effect (5122395569059384741) -->
-    <skip />
-    <!-- no translation found for aspect7to5_effect (5780001758108328143) -->
-    <skip />
-    <!-- no translation found for aspect9to16_effect (7740468012919660728) -->
-    <skip />
-    <!-- no translation found for aspectNone_effect (6263330561046574134) -->
-    <skip />
-    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
-    <skip />
-    <!-- no translation found for Fixed (8017376448916924565) -->
-    <skip />
-    <!-- no translation found for tinyplanet (2783694326474415761) -->
-    <skip />
-    <string name="exposure" msgid="6526397045949374905">"এক্সপ\'জাৰ"</string>
-    <!-- no translation found for sharpness (6463103068318055412) -->
-    <skip />
-    <!-- no translation found for contrast (2310908487756769019) -->
-    <skip />
-    <!-- no translation found for vibrance (3326744578577835915) -->
-    <skip />
-    <!-- no translation found for saturation (7026791551032438585) -->
-    <skip />
-    <!-- no translation found for bwfilter (8927492494576933793) -->
-    <skip />
-    <!-- no translation found for wbalance (6346581563387083613) -->
-    <skip />
-    <!-- no translation found for hue (6231252147971086030) -->
-    <skip />
-    <!-- no translation found for shadow_recovery (3928572915300287152) -->
-    <skip />
-    <!-- no translation found for highlight_recovery (8262208470735204243) -->
-    <skip />
-    <!-- no translation found for curvesRGB (915010781090477550) -->
-    <skip />
-    <!-- no translation found for vignette (934721068851885390) -->
-    <skip />
-    <!-- no translation found for vignette_main (6046495605390665423) -->
-    <skip />
-    <!-- no translation found for vignette_exposure (6862058227309534094) -->
-    <skip />
-    <!-- no translation found for vignette_saturation (1617055207565719771) -->
-    <skip />
-    <!-- no translation found for vignette_contrast (955732121756799897) -->
-    <skip />
-    <!-- no translation found for vignette_falloff (690918055030064199) -->
-    <skip />
-    <!-- no translation found for redeye (4508883127049472069) -->
-    <skip />
-    <!-- no translation found for imageDraw (6918552177844486656) -->
-    <skip />
-    <!-- no translation found for straighten (26025591664983528) -->
-    <!-- no translation found for straighten (5217801513491493491) -->
-    <skip />
-    <!-- no translation found for crop (5781263790107850771) -->
-    <!-- no translation found for crop (5584000454518174632) -->
-    <skip />
-    <!-- no translation found for rotate (2796802553793795371) -->
-    <!-- no translation found for rotate (460017689320955494) -->
-    <skip />
-    <!-- no translation found for mirror (5482518108154883096) -->
-    <skip />
-    <!-- no translation found for negative (6998313764388022201) -->
-    <skip />
-    <!-- no translation found for none (6633966646410296520) -->
-    <!-- no translation found for none (3601545724573307541) -->
-    <skip />
-    <!-- no translation found for edge (7036064886242147551) -->
-    <skip />
-    <!-- no translation found for kmeans (2080952022674981541) -->
-    <skip />
-    <!-- no translation found for downsample (3552938534146980104) -->
-    <skip />
-    <!-- no translation found for grad (546774853424848655) -->
-    <skip />
-    <!-- no translation found for editor_grad_brightness (5937316734380235741) -->
-    <skip />
-    <!-- no translation found for editor_grad_contrast (3454456673401803360) -->
-    <skip />
-    <!-- no translation found for editor_grad_saturation (3760247354109521726) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_main (4427652337797121940) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_red (1699222266490540696) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_yellow (1488997071882154179) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_green (1514055896212975167) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_cyan (1367634650172508288) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_blue (384409736863387895) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_magenta (6689215719351415546) -->
-    <skip />
-    <!-- no translation found for editor_grad_style (2168414479007745179) -->
-    <skip />
-    <!-- no translation found for editor_grad_new (4857265951369377379) -->
-    <skip />
-    <!-- no translation found for curves_channel_rgb (7909209509638333690) -->
-    <skip />
-    <!-- no translation found for curves_channel_red (4199710104162111357) -->
-    <skip />
-    <!-- no translation found for curves_channel_green (3733003466905031016) -->
-    <skip />
-    <!-- no translation found for curves_channel_blue (9129211507395079371) -->
-    <skip />
-    <!-- no translation found for draw_style (2036125061987325389) -->
-    <skip />
-    <!-- no translation found for draw_size (4360005386104151209) -->
-    <skip />
-    <!-- no translation found for draw_hue (4975135843189267133) -->
-    <skip />
-    <!-- no translation found for draw_saturation (5394395648014454882) -->
-    <skip />
-    <!-- no translation found for draw_value (6571604055161538273) -->
-    <skip />
-    <!-- no translation found for draw_color (2119030386987211193) -->
-    <skip />
-    <!-- no translation found for draw_style_line (9216476853904429628) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_spatter (7612691122932981554) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_marker (8468302322165644292) -->
-    <skip />
-    <!-- no translation found for draw_clear (6728155515454921052) -->
-    <skip />
-    <!-- no translation found for color_border_size (1086895807615869290) -->
-    <skip />
-    <!-- no translation found for color_border_corner_size (7637235159438869979) -->
-    <skip />
-    <!-- no translation found for color_border_color (8765458414425980711) -->
-    <skip />
-    <!-- no translation found for color_border_clear (4418261191091091722) -->
-    <skip />
-    <!-- no translation found for color_pick_select (734312818059057394) -->
-    <skip />
-    <!-- no translation found for color_pick_title (6195567431995308876) -->
-    <skip />
-    <!-- no translation found for draw_size_title (3121649039610273977) -->
-    <skip />
-    <!-- no translation found for draw_size_accept (6781529716526190028) -->
-    <skip />
-    <!-- no translation found for state_panel_original (9069584409934164419) -->
-    <skip />
-    <!-- no translation found for state_panel_result (318640531123298676) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_label (1653168445525855247) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_message (2661871765484036286) -->
-    <skip />
-    <!-- no translation found for filtershow_save_preset (3933550455577927439) -->
-    <skip />
-    <!-- no translation found for filtershow_manage_preset (3872896753708921286) -->
-    <skip />
-    <!-- no translation found for filtershow_new_preset (8923930134923416617) -->
-    <skip />
-    <!-- no translation found for filtershow_preset_name (7015939727047649866) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel (5773036746043711115) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_name (5908258517140549439) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_size (1714666849204493017) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_histogram (2669188469897955809) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_exif (4965486882625125154) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_looks (8630823661416925426) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_versions (7620107266685809612) -->
-    <skip />
-    <!-- no translation found for filtershow_version_original (1413894292200912828) -->
-    <skip />
-    <!-- no translation found for filtershow_version_current (6609334422797468952) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_model (3543206476046267466) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_aperture (5076571522763604380) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_focal_length (5925151469731623706) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_iso (5822494416955625317) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_subject_distance (4920632253433906646) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_date (8882402253732028544) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_f_stop (6081797865604483139) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_exposure_time (4099067062781294115) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_copyright (8801875918803737581) -->
-    <skip />
-</resources>
diff --git a/res/values-en-rXC/filtershow_strings.xml b/res/values-en-rXC/filtershow_strings.xml
deleted file mode 100644
index 617898134..000000000
--- a/res/values-en-rXC/filtershow_strings.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for title_activity_filter_show (2036539130684382763) -->
-    <skip />
-    <!-- no translation found for cannot_load_image (5023634941212959976) -->
-    <skip />
-    <!-- no translation found for cannot_edit_original (5890293845882609388) -->
-    <skip />
-    <!-- no translation found for original_picture_text (3076213290079909698) -->
-    <skip />
-    <!-- no translation found for setting_wallpaper (4679087092300036632) -->
-    <skip />
-    <!-- no translation found for download_failure (5923323939788582895) -->
-    <skip />
-    <!-- no translation found for original (3524493791230430897) -->
-    <skip />
-    <!-- no translation found for borders (2067345080568684614) -->
-    <!-- no translation found for borders (4461692156695893616) -->
-    <skip />
-    <!-- no translation found for custom_border (8679893731790931871) -->
-    <skip />
-    <!-- no translation found for filtershow_undo (6781743189243585101) -->
-    <skip />
-    <!-- no translation found for filtershow_redo (4219489910543059747) -->
-    <skip />
-    <!-- no translation found for show_imagestate_panel (281932769701043015) -->
-    <skip />
-    <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
-    <skip />
-    <!-- no translation found for export_image (3202835713172222134) -->
-    <skip />
-    <!-- no translation found for print_image (1942989216591621413) -->
-    <skip />
-    <!-- no translation found for export_flattened (9046192331465915411) -->
-    <skip />
-    <!-- no translation found for select_output_settings (1268532018080310748) -->
-    <skip />
-    <!-- no translation found for quality (179292110309050529) -->
-    <skip />
-    <!-- no translation found for size (4639404642236356037) -->
-    <skip />
-    <!-- no translation found for x (6810256999024563662) -->
-    <skip />
-    <!-- no translation found for menu_settings (6428291655769260831) -->
-    <skip />
-    <!-- no translation found for unsaved (8704442449002374375) -->
-    <skip />
-    <!-- no translation found for save_before_exit (2680660633675916712) -->
-    <skip />
-    <!-- no translation found for save_and_exit (3628425023766687419) -->
-    <skip />
-    <!-- no translation found for save_and_processing (6371565035837463194) -->
-    <skip />
-    <!-- no translation found for exit (242642957038770113) -->
-    <skip />
-    <!-- no translation found for history (455767361472692409) -->
-    <skip />
-    <!-- no translation found for reset (9013181350779592937) -->
-    <skip />
-    <!-- no translation found for history_original (150973253194312841) -->
-    <skip />
-    <!-- no translation found for imageState (8632586742752891968) -->
-    <skip />
-    <!-- no translation found for compare_original (8140838959007796977) -->
-    <skip />
-    <!-- no translation found for apply_effect (1218288221200568947) -->
-    <skip />
-    <!-- no translation found for reset_effect (7712605581024929564) -->
-    <skip />
-    <!-- no translation found for aspect (4025244950820813059) -->
-    <skip />
-    <!-- no translation found for aspect1to1_effect (1159104543795779123) -->
-    <skip />
-    <!-- no translation found for aspect4to3_effect (7968067847241223578) -->
-    <skip />
-    <!-- no translation found for aspect3to4_effect (7078163990979248864) -->
-    <skip />
-    <!-- no translation found for aspect4to6_effect (1410129351686165654) -->
-    <skip />
-    <!-- no translation found for aspect5to7_effect (5122395569059384741) -->
-    <skip />
-    <!-- no translation found for aspect7to5_effect (5780001758108328143) -->
-    <skip />
-    <!-- no translation found for aspect9to16_effect (7740468012919660728) -->
-    <skip />
-    <!-- no translation found for aspectNone_effect (6263330561046574134) -->
-    <skip />
-    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
-    <skip />
-    <!-- no translation found for Fixed (8017376448916924565) -->
-    <skip />
-    <!-- no translation found for tinyplanet (2783694326474415761) -->
-    <skip />
-    <string name="exposure" msgid="6526397045949374905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎Exposure‎‏‎‎‏‎"</string>
-    <!-- no translation found for sharpness (6463103068318055412) -->
-    <skip />
-    <!-- no translation found for contrast (2310908487756769019) -->
-    <skip />
-    <!-- no translation found for vibrance (3326744578577835915) -->
-    <skip />
-    <!-- no translation found for saturation (7026791551032438585) -->
-    <skip />
-    <!-- no translation found for bwfilter (8927492494576933793) -->
-    <skip />
-    <!-- no translation found for wbalance (6346581563387083613) -->
-    <skip />
-    <!-- no translation found for hue (6231252147971086030) -->
-    <skip />
-    <!-- no translation found for shadow_recovery (3928572915300287152) -->
-    <skip />
-    <!-- no translation found for highlight_recovery (8262208470735204243) -->
-    <skip />
-    <!-- no translation found for curvesRGB (915010781090477550) -->
-    <skip />
-    <!-- no translation found for vignette (934721068851885390) -->
-    <skip />
-    <!-- no translation found for vignette_main (6046495605390665423) -->
-    <skip />
-    <!-- no translation found for vignette_exposure (6862058227309534094) -->
-    <skip />
-    <!-- no translation found for vignette_saturation (1617055207565719771) -->
-    <skip />
-    <!-- no translation found for vignette_contrast (955732121756799897) -->
-    <skip />
-    <!-- no translation found for vignette_falloff (690918055030064199) -->
-    <skip />
-    <!-- no translation found for redeye (4508883127049472069) -->
-    <skip />
-    <!-- no translation found for imageDraw (6918552177844486656) -->
-    <skip />
-    <!-- no translation found for straighten (26025591664983528) -->
-    <!-- no translation found for straighten (5217801513491493491) -->
-    <skip />
-    <!-- no translation found for crop (5781263790107850771) -->
-    <!-- no translation found for crop (5584000454518174632) -->
-    <skip />
-    <!-- no translation found for rotate (2796802553793795371) -->
-    <!-- no translation found for rotate (460017689320955494) -->
-    <skip />
-    <!-- no translation found for mirror (5482518108154883096) -->
-    <skip />
-    <!-- no translation found for negative (6998313764388022201) -->
-    <skip />
-    <!-- no translation found for none (6633966646410296520) -->
-    <!-- no translation found for none (3601545724573307541) -->
-    <skip />
-    <!-- no translation found for edge (7036064886242147551) -->
-    <skip />
-    <!-- no translation found for kmeans (2080952022674981541) -->
-    <skip />
-    <!-- no translation found for downsample (3552938534146980104) -->
-    <skip />
-    <!-- no translation found for grad (546774853424848655) -->
-    <skip />
-    <!-- no translation found for editor_grad_brightness (5937316734380235741) -->
-    <skip />
-    <!-- no translation found for editor_grad_contrast (3454456673401803360) -->
-    <skip />
-    <!-- no translation found for editor_grad_saturation (3760247354109521726) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_main (4427652337797121940) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_red (1699222266490540696) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_yellow (1488997071882154179) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_green (1514055896212975167) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_cyan (1367634650172508288) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_blue (384409736863387895) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_magenta (6689215719351415546) -->
-    <skip />
-    <!-- no translation found for editor_grad_style (2168414479007745179) -->
-    <skip />
-    <!-- no translation found for editor_grad_new (4857265951369377379) -->
-    <skip />
-    <!-- no translation found for curves_channel_rgb (7909209509638333690) -->
-    <skip />
-    <!-- no translation found for curves_channel_red (4199710104162111357) -->
-    <skip />
-    <!-- no translation found for curves_channel_green (3733003466905031016) -->
-    <skip />
-    <!-- no translation found for curves_channel_blue (9129211507395079371) -->
-    <skip />
-    <!-- no translation found for draw_style (2036125061987325389) -->
-    <skip />
-    <!-- no translation found for draw_size (4360005386104151209) -->
-    <skip />
-    <!-- no translation found for draw_hue (4975135843189267133) -->
-    <skip />
-    <!-- no translation found for draw_saturation (5394395648014454882) -->
-    <skip />
-    <!-- no translation found for draw_value (6571604055161538273) -->
-    <skip />
-    <!-- no translation found for draw_color (2119030386987211193) -->
-    <skip />
-    <!-- no translation found for draw_style_line (9216476853904429628) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_spatter (7612691122932981554) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_marker (8468302322165644292) -->
-    <skip />
-    <!-- no translation found for draw_clear (6728155515454921052) -->
-    <skip />
-    <!-- no translation found for color_border_size (1086895807615869290) -->
-    <skip />
-    <!-- no translation found for color_border_corner_size (7637235159438869979) -->
-    <skip />
-    <!-- no translation found for color_border_color (8765458414425980711) -->
-    <skip />
-    <!-- no translation found for color_border_clear (4418261191091091722) -->
-    <skip />
-    <!-- no translation found for color_pick_select (734312818059057394) -->
-    <skip />
-    <!-- no translation found for color_pick_title (6195567431995308876) -->
-    <skip />
-    <!-- no translation found for draw_size_title (3121649039610273977) -->
-    <skip />
-    <!-- no translation found for draw_size_accept (6781529716526190028) -->
-    <skip />
-    <!-- no translation found for state_panel_original (9069584409934164419) -->
-    <skip />
-    <!-- no translation found for state_panel_result (318640531123298676) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_label (1653168445525855247) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_message (2661871765484036286) -->
-    <skip />
-    <!-- no translation found for filtershow_save_preset (3933550455577927439) -->
-    <skip />
-    <!-- no translation found for filtershow_manage_preset (3872896753708921286) -->
-    <skip />
-    <!-- no translation found for filtershow_new_preset (8923930134923416617) -->
-    <skip />
-    <!-- no translation found for filtershow_preset_name (7015939727047649866) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel (5773036746043711115) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_name (5908258517140549439) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_size (1714666849204493017) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_histogram (2669188469897955809) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_exif (4965486882625125154) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_looks (8630823661416925426) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_versions (7620107266685809612) -->
-    <skip />
-    <!-- no translation found for filtershow_version_original (1413894292200912828) -->
-    <skip />
-    <!-- no translation found for filtershow_version_current (6609334422797468952) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_model (3543206476046267466) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_aperture (5076571522763604380) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_focal_length (5925151469731623706) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_iso (5822494416955625317) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_subject_distance (4920632253433906646) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_date (8882402253732028544) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_f_stop (6081797865604483139) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_exposure_time (4099067062781294115) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_copyright (8801875918803737581) -->
-    <skip />
-</resources>
diff --git a/res/values-or/filtershow_strings.xml b/res/values-or/filtershow_strings.xml
deleted file mode 100644
index 74497419f..000000000
--- a/res/values-or/filtershow_strings.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for title_activity_filter_show (2036539130684382763) -->
-    <skip />
-    <!-- no translation found for cannot_load_image (5023634941212959976) -->
-    <skip />
-    <!-- no translation found for cannot_edit_original (5890293845882609388) -->
-    <skip />
-    <!-- no translation found for original_picture_text (3076213290079909698) -->
-    <skip />
-    <!-- no translation found for setting_wallpaper (4679087092300036632) -->
-    <skip />
-    <!-- no translation found for download_failure (5923323939788582895) -->
-    <skip />
-    <!-- no translation found for original (3524493791230430897) -->
-    <skip />
-    <!-- no translation found for borders (2067345080568684614) -->
-    <!-- no translation found for borders (4461692156695893616) -->
-    <skip />
-    <!-- no translation found for custom_border (8679893731790931871) -->
-    <skip />
-    <!-- no translation found for filtershow_undo (6781743189243585101) -->
-    <skip />
-    <!-- no translation found for filtershow_redo (4219489910543059747) -->
-    <skip />
-    <!-- no translation found for show_imagestate_panel (281932769701043015) -->
-    <skip />
-    <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
-    <skip />
-    <!-- no translation found for export_image (3202835713172222134) -->
-    <skip />
-    <!-- no translation found for print_image (1942989216591621413) -->
-    <skip />
-    <!-- no translation found for export_flattened (9046192331465915411) -->
-    <skip />
-    <!-- no translation found for select_output_settings (1268532018080310748) -->
-    <skip />
-    <!-- no translation found for quality (179292110309050529) -->
-    <skip />
-    <!-- no translation found for size (4639404642236356037) -->
-    <skip />
-    <!-- no translation found for x (6810256999024563662) -->
-    <skip />
-    <!-- no translation found for menu_settings (6428291655769260831) -->
-    <skip />
-    <!-- no translation found for unsaved (8704442449002374375) -->
-    <skip />
-    <!-- no translation found for save_before_exit (2680660633675916712) -->
-    <skip />
-    <!-- no translation found for save_and_exit (3628425023766687419) -->
-    <skip />
-    <!-- no translation found for save_and_processing (6371565035837463194) -->
-    <skip />
-    <!-- no translation found for exit (242642957038770113) -->
-    <skip />
-    <!-- no translation found for history (455767361472692409) -->
-    <skip />
-    <!-- no translation found for reset (9013181350779592937) -->
-    <skip />
-    <!-- no translation found for history_original (150973253194312841) -->
-    <skip />
-    <!-- no translation found for imageState (8632586742752891968) -->
-    <skip />
-    <!-- no translation found for compare_original (8140838959007796977) -->
-    <skip />
-    <!-- no translation found for apply_effect (1218288221200568947) -->
-    <skip />
-    <!-- no translation found for reset_effect (7712605581024929564) -->
-    <skip />
-    <!-- no translation found for aspect (4025244950820813059) -->
-    <skip />
-    <!-- no translation found for aspect1to1_effect (1159104543795779123) -->
-    <skip />
-    <!-- no translation found for aspect4to3_effect (7968067847241223578) -->
-    <skip />
-    <!-- no translation found for aspect3to4_effect (7078163990979248864) -->
-    <skip />
-    <!-- no translation found for aspect4to6_effect (1410129351686165654) -->
-    <skip />
-    <!-- no translation found for aspect5to7_effect (5122395569059384741) -->
-    <skip />
-    <!-- no translation found for aspect7to5_effect (5780001758108328143) -->
-    <skip />
-    <!-- no translation found for aspect9to16_effect (7740468012919660728) -->
-    <skip />
-    <!-- no translation found for aspectNone_effect (6263330561046574134) -->
-    <skip />
-    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
-    <skip />
-    <!-- no translation found for Fixed (8017376448916924565) -->
-    <skip />
-    <!-- no translation found for tinyplanet (2783694326474415761) -->
-    <skip />
-    <string name="exposure" msgid="6526397045949374905">"ଏକ୍ସପୋଜର୍"</string>
-    <!-- no translation found for sharpness (6463103068318055412) -->
-    <skip />
-    <!-- no translation found for contrast (2310908487756769019) -->
-    <skip />
-    <!-- no translation found for vibrance (3326744578577835915) -->
-    <skip />
-    <!-- no translation found for saturation (7026791551032438585) -->
-    <skip />
-    <!-- no translation found for bwfilter (8927492494576933793) -->
-    <skip />
-    <!-- no translation found for wbalance (6346581563387083613) -->
-    <skip />
-    <!-- no translation found for hue (6231252147971086030) -->
-    <skip />
-    <!-- no translation found for shadow_recovery (3928572915300287152) -->
-    <skip />
-    <!-- no translation found for highlight_recovery (8262208470735204243) -->
-    <skip />
-    <!-- no translation found for curvesRGB (915010781090477550) -->
-    <skip />
-    <!-- no translation found for vignette (934721068851885390) -->
-    <skip />
-    <!-- no translation found for vignette_main (6046495605390665423) -->
-    <skip />
-    <!-- no translation found for vignette_exposure (6862058227309534094) -->
-    <skip />
-    <!-- no translation found for vignette_saturation (1617055207565719771) -->
-    <skip />
-    <!-- no translation found for vignette_contrast (955732121756799897) -->
-    <skip />
-    <!-- no translation found for vignette_falloff (690918055030064199) -->
-    <skip />
-    <!-- no translation found for redeye (4508883127049472069) -->
-    <skip />
-    <!-- no translation found for imageDraw (6918552177844486656) -->
-    <skip />
-    <!-- no translation found for straighten (26025591664983528) -->
-    <!-- no translation found for straighten (5217801513491493491) -->
-    <skip />
-    <!-- no translation found for crop (5781263790107850771) -->
-    <!-- no translation found for crop (5584000454518174632) -->
-    <skip />
-    <!-- no translation found for rotate (2796802553793795371) -->
-    <!-- no translation found for rotate (460017689320955494) -->
-    <skip />
-    <!-- no translation found for mirror (5482518108154883096) -->
-    <skip />
-    <!-- no translation found for negative (6998313764388022201) -->
-    <skip />
-    <!-- no translation found for none (6633966646410296520) -->
-    <!-- no translation found for none (3601545724573307541) -->
-    <skip />
-    <!-- no translation found for edge (7036064886242147551) -->
-    <skip />
-    <!-- no translation found for kmeans (2080952022674981541) -->
-    <skip />
-    <!-- no translation found for downsample (3552938534146980104) -->
-    <skip />
-    <!-- no translation found for grad (546774853424848655) -->
-    <skip />
-    <!-- no translation found for editor_grad_brightness (5937316734380235741) -->
-    <skip />
-    <!-- no translation found for editor_grad_contrast (3454456673401803360) -->
-    <skip />
-    <!-- no translation found for editor_grad_saturation (3760247354109521726) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_main (4427652337797121940) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_red (1699222266490540696) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_yellow (1488997071882154179) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_green (1514055896212975167) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_cyan (1367634650172508288) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_blue (384409736863387895) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_magenta (6689215719351415546) -->
-    <skip />
-    <!-- no translation found for editor_grad_style (2168414479007745179) -->
-    <skip />
-    <!-- no translation found for editor_grad_new (4857265951369377379) -->
-    <skip />
-    <!-- no translation found for curves_channel_rgb (7909209509638333690) -->
-    <skip />
-    <!-- no translation found for curves_channel_red (4199710104162111357) -->
-    <skip />
-    <!-- no translation found for curves_channel_green (3733003466905031016) -->
-    <skip />
-    <!-- no translation found for curves_channel_blue (9129211507395079371) -->
-    <skip />
-    <!-- no translation found for draw_style (2036125061987325389) -->
-    <skip />
-    <!-- no translation found for draw_size (4360005386104151209) -->
-    <skip />
-    <!-- no translation found for draw_hue (4975135843189267133) -->
-    <skip />
-    <!-- no translation found for draw_saturation (5394395648014454882) -->
-    <skip />
-    <!-- no translation found for draw_value (6571604055161538273) -->
-    <skip />
-    <!-- no translation found for draw_color (2119030386987211193) -->
-    <skip />
-    <!-- no translation found for draw_style_line (9216476853904429628) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_spatter (7612691122932981554) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_marker (8468302322165644292) -->
-    <skip />
-    <!-- no translation found for draw_clear (6728155515454921052) -->
-    <skip />
-    <!-- no translation found for color_border_size (1086895807615869290) -->
-    <skip />
-    <!-- no translation found for color_border_corner_size (7637235159438869979) -->
-    <skip />
-    <!-- no translation found for color_border_color (8765458414425980711) -->
-    <skip />
-    <!-- no translation found for color_border_clear (4418261191091091722) -->
-    <skip />
-    <!-- no translation found for color_pick_select (734312818059057394) -->
-    <skip />
-    <!-- no translation found for color_pick_title (6195567431995308876) -->
-    <skip />
-    <!-- no translation found for draw_size_title (3121649039610273977) -->
-    <skip />
-    <!-- no translation found for draw_size_accept (6781529716526190028) -->
-    <skip />
-    <!-- no translation found for state_panel_original (9069584409934164419) -->
-    <skip />
-    <!-- no translation found for state_panel_result (318640531123298676) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_label (1653168445525855247) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_message (2661871765484036286) -->
-    <skip />
-    <!-- no translation found for filtershow_save_preset (3933550455577927439) -->
-    <skip />
-    <!-- no translation found for filtershow_manage_preset (3872896753708921286) -->
-    <skip />
-    <!-- no translation found for filtershow_new_preset (8923930134923416617) -->
-    <skip />
-    <!-- no translation found for filtershow_preset_name (7015939727047649866) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel (5773036746043711115) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_name (5908258517140549439) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_size (1714666849204493017) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_histogram (2669188469897955809) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_exif (4965486882625125154) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_looks (8630823661416925426) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_versions (7620107266685809612) -->
-    <skip />
-    <!-- no translation found for filtershow_version_original (1413894292200912828) -->
-    <skip />
-    <!-- no translation found for filtershow_version_current (6609334422797468952) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_model (3543206476046267466) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_aperture (5076571522763604380) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_focal_length (5925151469731623706) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_iso (5822494416955625317) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_subject_distance (4920632253433906646) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_date (8882402253732028544) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_f_stop (6081797865604483139) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_exposure_time (4099067062781294115) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_copyright (8801875918803737581) -->
-    <skip />
-</resources>