Import translations. DO NOT MERGE am: 8bc8d4d4f7 -s ours am: 8fdb88e42b -s ours...

am: 831cbc7d53  -s ours

Change-Id: I95835680a033e62e6c18a27299cee689c6b0983e

diff --git a/Android.mk b/Android.mk
index 3088512..670cc4c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -8,19 +8,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
 
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
-
-# Keep track of previously compiled RS files too (from bundled GalleryGoogle).
-prev_compiled_rs_files := $(call all-renderscript-files-under, src)
-
-# We already have these files from GalleryGoogle, so don't install them.
-LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files)
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
@@ -33,7 +24,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
+LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2aea569..43a2b3f 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="24" />
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
@@ -137,13 +137,7 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="image/bmp" />
-                <data android:mimeType="image/jpeg" />
-                <data android:mimeType="image/gif" />
-                <data android:mimeType="image/png" />
-                <data android:mimeType="image/webp" />
-                <data android:mimeType="image/x-ms-bmp" />
-                <data android:mimeType="image/vnd.wap.wbmp" />
+                <data android:mimeType="image/*" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
             <intent-filter>

diff --git a/jni/filters/wbalance.c b/jni/filters/wbalance.c
index 2b92b99..7592a42 100644 (file)
--- a/jni/filters/wbalance.c
+++ b/jni/filters/wbalance.c
@@ -99,10 +99,10 @@ void estmateWhite(unsigned char *src, int len, int *wr, int *wb, int *wg){
 }
 
 void estmateWhiteBox(unsigned char *src, int iw, int ih, int x,int y, int *wr, int *wb, int *wg){
-    int r;
-    int g;
-    int b;
-    int sum;
+    int r = 0;
+    int g = 0;
+    int b = 0;
+    int sum = 0;
     int xp,yp;
     int bounds = 5;
     if (x<0) x = bounds;

diff --git a/proguard.flags b/proguard.flags
index 65104ec..c8ba2ff 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -40,8 +40,6 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
--keep class android.support.v8.renderscript.** { *; }
-
 # Required for ActionBarSherlock
 -keep class android.support.v4.app.** { *; }
 -keep interface android.support.v4.app.** { *; }
@@ -84,3 +82,7 @@
 -keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
 -keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
 -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-ar/filtershow_strings.xml b/res/values-ar/filtershow_strings.xml
index 416906f..f865db3 100644 (file)
--- a/res/values-ar/filtershow_strings.xml
+++ b/res/values-ar/filtershow_strings.xml
@@ -56,8 +56,8 @@
     <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
     <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
     <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
-    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
-    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"۵:۷"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"۷:۵"</string>
     <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
     <string name="aspectNone_effect" msgid="6263330561046574134">"لا شيء"</string>
     <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->

diff --git a/res/values-b+sr+Latn/filtershow_strings.xml b/res/values-b+sr+Latn/filtershow_strings.xml
new file mode 100644 (file)
index 0000000..c6f84ea
--- /dev/null
+++ b/res/values-b+sr+Latn/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Uređivač slika"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Nije moguće učitati sliku!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Nije moguće izmeniti original"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Podešavanje pozadine"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nije moguće preuzeti sliku. Mreža nije dostupna."</string>
+    <string name="original" msgid="3524493791230430897">"Originalna"</string>
+    <string name="borders" msgid="2067345080568684614">"Ivice"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Prilagođeno"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Opozovi"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Ponovi"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Prikaži primenjene efekte"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sakrij primenjene efekte"</string>
+    <string name="export_image" msgid="3202835713172222134">"Izvezi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Štampaj"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Izvezi jednoslojnu sliku"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Izvezena slika biće kopija bez istorije."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Veličina"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Podešavanja"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Postoje nesačuvane izmene ove slike."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Želite li da sačuvate pre nego što izađete?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Sačuvaj i izađi"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Obrađivanje slike u punoj rezoluciji..."</string>
+    <string name="exit" msgid="242642957038770113">"Izađi"</string>
+    <string name="history" msgid="455767361472692409">"Istorija"</string>
+    <string name="reset" msgid="9013181350779592937">"Ponovo postavi"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Primenjeni efekti"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Uporedi"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Primeni"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Ponovo postavi"</string>
+    <string name="aspect" msgid="4025244950820813059">"Razmera"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Nijedno"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fiksno"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Mala planeta"</string>
+    <string name="exposure" msgid="6526397045949374905">"Ekspozicija"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Oštrina"</string>
+    <string name="contrast" msgid="2310908487756769019">"Kontrast"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Živost boja"</string>
+    <string name="saturation" msgid="7026791551032438585">"Zasićenje"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Crno-beli filter"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Automatska boja"</string>
+    <string name="hue" msgid="6231252147971086030">"Nijansa"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Senke"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Isticanja"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Krive"</string>
+    <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozicija"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Zasićenost boja"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Slab. svetlosti"</string>
+    <string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Crtanje"</string>
+    <string name="straighten" msgid="26025591664983528">"Ispravljanje"</string>
+    <string name="crop" msgid="5781263790107850771">"Opsecanje"</string>
+    <string name="rotate" msgid="2796802553793795371">"Rotiraj"</string>
+    <string name="mirror" msgid="5482518108154883096">"Ogledalo"</string>
+    <string name="negative" msgid="6998313764388022201">"Negativ"</string>
+    <string name="none" msgid="6633966646410296520">"Nijedno"</string>
+    <string name="edge" msgid="7036064886242147551">"Ivice"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizuj"</string>
+    <string name="downsample" msgid="3552938534146980104">"Smanji"</string>
+    <string name="grad" msgid="546774853424848655">"Gradacija"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Osvetljenost"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Zasićenost boja"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavno"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Crvena"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žuta"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Plava"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Crvena"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Zelena"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Plava"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Veličina"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nijansa"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Zasićen. boja"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Osvetljenost"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Boja"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Linije"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Označivač"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Prskanje"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Obriši"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Debljina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Veličina ugla"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Obriši"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Izaberi prilagođenu boju"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Izbor boje"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Izbor veličine"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Potvrdi"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Originalna"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Čuvanje slike"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Obrađuje se..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Sačuvaj aktuelna podešavanja"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravljaj korisničkim podeš."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Novo unapred određeno podešav."</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Naziv unapred odr. podešavanja"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacije"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Naziv slike"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veličina slike"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF podaci"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Unapred podešeno"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuelno"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Otvor blende"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Žižna daljina"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Udaljenost subjekta"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum snimanja"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Žižni broj"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Vreme ekspozicije"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorska prava"</string>
+</resources>

diff --git a/res/values-be-rBY/filtershow_strings.xml b/res/values-be-rBY/filtershow_strings.xml
new file mode 100644 (file)
index 0000000..182bce1
--- /dev/null
+++ b/res/values-be-rBY/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Фотарэдактар"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Не атрымлiваецца загрузіць малюнак"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Немагчыма адрэдагаваць арыгінал"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Усталёўка шпалер..."</string>
+    <string name="download_failure" msgid="5923323939788582895">"Не атрымалася спампаваць фота. Сетка недаступная."</string>
+    <string name="original" msgid="3524493791230430897">"Арыгiнал"</string>
+    <string name="borders" msgid="2067345080568684614">"Межы"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Карыстальніцкі"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Адрабіць"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Паўтарыць"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Паказваць прымененыя эфекты"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Хаваць прымененыя эфекты"</string>
+    <string name="export_image" msgid="3202835713172222134">"Экспартаваць"</string>
+    <string name="print_image" msgid="1942989216591621413">"Друк"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Экспарт. зведзены відарыс"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Экспартаваны відарыс будзе з\'яўляцца копіяй і не мець гісторыі."</string>
+    <string name="quality" msgid="179292110309050529">"Якасць"</string>
+    <string name="size" msgid="4639404642236356037">"Памер"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Налады"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Існуюць незахаваныя змяненні ў гэтай выяве."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Жадаеце захавацца перад выхадам?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Захаваць і выйсці"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Апрацоўка відарыса ў поўнай раздзяляльнасці..."</string>
+    <string name="exit" msgid="242642957038770113">"Выйсці"</string>
+    <string name="history" msgid="455767361472692409">"Гісторыя"</string>
+    <string name="reset" msgid="9013181350779592937">"Скінуць"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Прымененыя эфекты"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Параўнаць"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Паспрабаваць"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Скінуць"</string>
+    <string name="aspect" msgid="4025244950820813059">"Аспект"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Няма"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Выпраўленыя"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Маленькая планета"</string>
+    <string name="exposure" msgid="6526397045949374905">"Экспазіцыя"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Выразнасць"</string>
+    <string name="contrast" msgid="2310908487756769019">"Кантраст"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Вібрацыя"</string>
+    <string name="saturation" msgid="7026791551032438585">"Насычанасць"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Чорна-белы фiльтр"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Aўтаколер"</string>
+    <string name="hue" msgid="6231252147971086030">"Тон"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Цені"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Блікі"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Пэндзаль"</string>
+    <string name="vignette" msgid="934721068851885390">"Віньетка"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Віньетка"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Экспазіцыя"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Насычанасць"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Кантраст"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Віньетаванне"</string>
+    <string name="redeye" msgid="4508883127049472069">"Чырвонае вока"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Намаляваць"</string>
+    <string name="straighten" msgid="26025591664983528">"Выраўнаваць"</string>
+    <string name="crop" msgid="5781263790107850771">"Абрэзаць"</string>
+    <string name="rotate" msgid="2796802553793795371">"Павярнуць"</string>
+    <string name="mirror" msgid="5482518108154883096">"Люстра"</string>
+    <string name="negative" msgid="6998313764388022201">"Негатыў"</string>
+    <string name="none" msgid="6633966646410296520">"Няма"</string>
+    <string name="edge" msgid="7036064886242147551">"Краi"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Плакат"</string>
+    <string name="downsample" msgid="3552938534146980104">"Паменшыць"</string>
+    <string name="grad" msgid="546774853424848655">"Градыентны"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Яркасць"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Кантраст"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Насычанасць"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Галоўны"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Чырвоны"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Жоўты"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зялёны"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Блакітны"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Сiнi"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Пурпурны"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Стыль"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"новы"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Чырвоны"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Зялёны"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Сiнi"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Стыль"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Памер"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Адценне"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Насычанасць"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Яркасць"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Колер"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Лiнii"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркёр"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Пырскi"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Ачысціць"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Таўшчыня"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Памер вугла"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Колер"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Ачысціць"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Выбраць іншы колер"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Выберыце колер"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Выберыце памер"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Арыгiнал"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Вынiк"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Захаванне відарыса"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Апрацоўка..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Захаваць бягучую загатоўку"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Кіраванне карыстальніцкімі загатоўкамі"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Новая загатоўка"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Назва загатоўкі"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Інфармацыя"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Назва відарыса"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Памер відарыса"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Гістаграма"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Даныя EXIF"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Загатоўка"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Версія"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Арыгiнальная"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Бягучая"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Мадэль"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Апертура"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусная адлегласць"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Адлегласць да аб\'екта"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Дата здымка"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Лік дыяфрагмы"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Час экспазіцыі"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Аўтарскія правы"</string>
+</resources>

diff --git a/res/values-bn-rBD/filtershow_strings.xml b/res/values-bn-rBD/filtershow_strings.xml
index 6c6f1dc..3e80776 100644 (file)
--- a/res/values-bn-rBD/filtershow_strings.xml
+++ b/res/values-bn-rBD/filtershow_strings.xml
@@ -31,7 +31,7 @@
     <string name="show_imagestate_panel" msgid="281932769701043015">"প্রয়োগ করা প্রভাবগুলি দেখান"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"প্রয়োগ করা প্রভাবগুলি লুকান"</string>
     <string name="export_image" msgid="3202835713172222134">"রপ্তানি"</string>
-    <string name="print_image" msgid="1942989216591621413">"মà§\81দà§\8dরণ করুন"</string>
+    <string name="print_image" msgid="1942989216591621413">"পà§\8dরিনà§\8dà¦\9f করুন"</string>
     <string name="export_flattened" msgid="9046192331465915411">"চ্যাপ্টা চিত্র রপ্তানি করুন"</string>
     <string name="select_output_settings" msgid="1268532018080310748">"রপ্তানি করা চিত্রটি ইতিহাস ছাড়া, একটি অনুলিপি হবে।"</string>
     <string name="quality" msgid="179292110309050529">"গুণমান"</string>

diff --git a/res/values-bs-rBA/filtershow_strings.xml b/res/values-bs-rBA/filtershow_strings.xml
new file mode 100644 (file)
index 0000000..c515a79
--- /dev/null
+++ b/res/values-bs-rBA/filtershow_strings.xml
@@ -0,0 +1,156 @@
+<?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">
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Uređivač slika"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Greška prilikom učitavanja slike!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Originalna slika se ne može obrađivati"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Postavljanje pozadinske slike"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Greška prilikom preuzimanja slike. Mreža nije dostupna."</string>
+    <string name="original" msgid="3524493791230430897">"Original"</string>
+    <string name="borders" msgid="2067345080568684614">"Obrubi"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Prilagođeni obrub"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Vratiti"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Ponovo uradi"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Prikaži primijenjene efekte"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sakriti primijenjene efekte"</string>
+    <string name="export_image" msgid="3202835713172222134">"Snimanje slike"</string>
+    <string name="print_image" msgid="1942989216591621413">"Štampanje"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Snimi uravnjenu sliku"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Snimljena slika bit će kopija bez historije."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Veličina"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Postavke"</string>
+    <string name="unsaved" msgid="8704442449002374375">"U ovoj slici postoje izmjene koje nisu sačuvane."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Želite li sačuvati izmjene prije izlaska iz aplikacije?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Sačuvaj i izađi"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Obrada slike u punoj rezoluciji..."</string>
+    <string name="exit" msgid="242642957038770113">"Izlaz"</string>
+    <string name="history" msgid="455767361472692409">"Historija"</string>
+    <string name="reset" msgid="9013181350779592937">"Poništi"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Primijenjeni efekti"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Uporedi"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Primjeni efekt"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Poništi efekte"</string>
+    <string name="aspect" msgid="4025244950820813059">"Proporcije"</string>
+    <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
+    <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
+    <string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
+    <string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
+    <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+    <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
+    <string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Bez efekata"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fiksni razmjer"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Mala planeta"</string>
+    <string name="exposure" msgid="6526397045949374905">"Ekspozic."</string>
+    <string name="sharpness" msgid="6463103068318055412">"Oštrina"</string>
+    <string name="contrast" msgid="2310908487756769019">"Kontrast"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Žive boje"</string>
+    <string name="saturation" msgid="7026791551032438585">"Zasićenje"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"CB filter"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Automatski"</string>
+    <string name="hue" msgid="6231252147971086030">"Nijansa"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Sjene"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Isticanja"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
+    <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozicija"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Zasićenje"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Opadanje"</string>
+    <string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Crtanje"</string>
+    <string name="straighten" msgid="26025591664983528">"Poravnanje"</string>
+    <string name="crop" msgid="5781263790107850771">"Izrezati"</string>
+    <string name="rotate" msgid="2796802553793795371">"Rotiranje"</string>
+    <string name="mirror" msgid="5482518108154883096">"Ogledalo"</string>
+    <string name="negative" msgid="6998313764388022201">"Negativ"</string>
+    <string name="none" msgid="6633966646410296520">"Bez filt."</string>
+    <string name="edge" msgid="7036064886242147551">"Uglovi"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posteriziranje"</string>
+    <string name="downsample" msgid="3552938534146980104">"Smanjenje slike"</string>
+    <string name="grad" msgid="546774853424848655">"Stepenovanje"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Osvjetljenje"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Zasićenje"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavno"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Crvena"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žuta"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Plava"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Crvena"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Zelena"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Plava"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Veličina"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nijansa"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Zasićenje"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Osvjetljenje"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Boja"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Linije"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Prskanje"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Obrisati"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Debljina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Velič. uglova"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Obrisati"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Izabrati prilagođenu boju"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Izabrati boju"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Odabir veličine"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"UREDU"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Spremanje slike"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Obrada..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Sačuvati trenutnu raniju post."</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravljanje ranijim postavkama korisnika"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova ranija postavka"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Ime ranije postavke"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacije"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Ime slike"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veličina slike"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF podaci"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Ranije postavke"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Originalna verzija"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Trenutna verzija"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Blenda"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Žarišna dužina"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Udaljenost od subjekta"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum kada je slika snimljena"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stop broj"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Vrijeme ekspozicije"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorska prava"</string>
+</resources>

diff --git a/res/values-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml
index dfedadc..e2fe5dc 100644 (file)
--- a/res/values-ca/filtershow_strings.xml
+++ b/res/values-ca/filtershow_strings.xml
@@ -131,16 +131,16 @@
     <string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"S\'està desant la imatge"</string>
     <string name="filtershow_notification_message" msgid="2661871765484036286">"S\'està processant..."</string>
-    <string name="filtershow_save_preset" msgid="3933550455577927439">"Desa config. predet. actual"</string>
-    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestiona config. pred. usuari"</string>
-    <string name="filtershow_new_preset" msgid="8923930134923416617">"Configuració predet. nova"</string>
-    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nom de la configuració pred."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Desa valor predefinit"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestiona els valors predefinits de l\'usuari"</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Nou valor predefinit"</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Nom de valors predefinits"</string>
     <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informació"</string>
     <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nom de la imatge"</string>
     <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Mida de la imatge"</string>
     <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
     <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dades EXIF"</string>
-    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Configuració predeterminada"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Valors predefinits"</string>
     <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versió"</string>
     <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
     <string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>

diff --git a/res/values-gu-rIN/filtershow_strings.xml b/res/values-gu-rIN/filtershow_strings.xml
index 1348f59..9570724 100644 (file)
--- a/res/values-gu-rIN/filtershow_strings.xml
+++ b/res/values-gu-rIN/filtershow_strings.xml
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"કસ્ટમ રંગ પસંદ કરો"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"રંગ પસંદ કરો"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"કદ પસંદ કરો"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"àª\91કે"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"àª\93કે"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"મૂળભૂત"</string>
     <string name="state_panel_result" msgid="318640531123298676">"પરિણામ"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"ચિત્ર સાચવી રહ્યું છે"</string>

diff --git a/res/values-ml-rIN/filtershow_strings.xml b/res/values-ml-rIN/filtershow_strings.xml
index 777519a..10bbd3e 100644 (file)
--- a/res/values-ml-rIN/filtershow_strings.xml
+++ b/res/values-ml-rIN/filtershow_strings.xml
@@ -152,5 +152,5 @@
     <string name="filtershow_exif_date" msgid="8882402253732028544">"എടുത്ത തീയതി"</string>
     <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F നിർത്തുക"</string>
     <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"എക്‌സ്പോഷർ സമയം"</string>
-    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"à´ªà´\95à´°àµ\8dâ\80\8dപ്പവകാശം"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"à´ªà´\95ർപ്പവകാശം"</string>
 </resources>

diff --git a/res/values-mn-rMN/filtershow_strings.xml b/res/values-mn-rMN/filtershow_strings.xml
index 310c63d..aca5d44 100644 (file)
--- a/res/values-mn-rMN/filtershow_strings.xml
+++ b/res/values-mn-rMN/filtershow_strings.xml
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"Өнгө тохируулж сонгох"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"Өнгө сонгох"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"Хэмжээ сонгох"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"Тийм"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"Эх хувь"</string>
     <string name="state_panel_result" msgid="318640531123298676">"Үр дүн"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"Зургийг хадгалж байна"</string>

diff --git a/res/values-my-rMM/filtershow_strings.xml b/res/values-my-rMM/filtershow_strings.xml
index e2eb5b3..14c8714 100644 (file)
--- a/res/values-my-rMM/filtershow_strings.xml
+++ b/res/values-my-rMM/filtershow_strings.xml
@@ -44,13 +44,13 @@
     <string name="save_and_processing" msgid="6371565035837463194">"ကြည်လင်မှုအပြည့်ပုံအား လုပ်ဆောင်နေစဉ်..."</string>
     <string name="exit" msgid="242642957038770113">"ထွက်ပေါက်"</string>
     <string name="history" msgid="455767361472692409">"မှတ်တမ်း"</string>
-    <string name="reset" msgid="9013181350779592937">"á\80\95á\80¼á\80\94á\80ºá\80\9cá\80\8aá\80ºá\80\85á\80\90á\80\84á\80ºá\80\85á\80±ရန်"</string>
+    <string name="reset" msgid="9013181350779592937">"á\80\95á\80¼á\80\94á\80ºá\80\9cá\80\8aá\80ºá\80\9eá\80\90á\80ºá\80\99á\80¾á\80\90á\80ºရန်"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"လုပ်ထားသော အထူးပြုလုပ်ချက်များ"</string>
     <string name="compare_original" msgid="8140838959007796977">"နှိုင်းယှဉ်ရန်"</string>
     <string name="apply_effect" msgid="1218288221200568947">"လုပ်ဆောင်ရန်"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"á\80\95á\80¼á\80\94á\80ºá\80\9cá\80\8aá\80ºá\80\85á\80\90á\80\84á\80ºá\80\85á\80±ရန်"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"á\80\95á\80¼á\80\94á\80ºá\80\9cá\80\8aá\80ºá\80\9eá\80\90á\80ºá\80\99á\80¾á\80\90á\80ºရန်"</string>
     <string name="aspect" msgid="4025244950820813059">"အလိုက်သင့်"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"၁:၁"</string>
     <string name="aspect4to3_effect" msgid="7968067847241223578">"၄:၃"</string>
@@ -118,11 +118,11 @@
     <string name="draw_style_line" msgid="9216476853904429628">"စာကြောင်းများ"</string>
     <string name="draw_style_brush_spatter" msgid="7612691122932981554">"မှတ်သားမှု"</string>
     <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
-    <string name="draw_clear" msgid="6728155515454921052">"á\80\9bá\80¾á\80\84á\80ºá\80¸á\80\9cá\80\84á\80ºးရန်"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"á\80\96á\80\9aá\80ºá\80\9bá\80¾á\80¬းရန်"</string>
     <string name="color_border_size" msgid="1086895807615869290">"အထူ"</string>
     <string name="color_border_corner_size" msgid="7637235159438869979">"ထောင့်အရွယ်"</string>
     <string name="color_border_color" msgid="8765458414425980711">"ရောင်စုံ"</string>
-    <string name="color_border_clear" msgid="4418261191091091722">"á\80\9bá\80¾á\80\84á\80ºá\80¸á\80\9cá\80\84á\80ºးရန်"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"á\80\96á\80\9aá\80ºá\80\9bá\80¾á\80¬းရန်"</string>
     <string name="color_pick_select" msgid="734312818059057394">"မိမိစိတ်ကြိုက်အရောင်းရွေးရန်"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"အရောင်ရွေးရန်"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"အရွယ်အစားရွေးရန်"</string>

diff --git a/res/values-ne-rNP/filtershow_strings.xml b/res/values-ne-rNP/filtershow_strings.xml
index fc6ef13..477971b 100644 (file)
--- a/res/values-ne-rNP/filtershow_strings.xml
+++ b/res/values-ne-rNP/filtershow_strings.xml
@@ -16,13 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="title_activity_filter_show" msgid="2036539130684382763">"फà¥\8bà¤\9fà¥\8b सम्पादक"</string>
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"तसà¥\8dबिर सम्पादक"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"तस्बिर लोड गर्न सकेन!"</string>
     <string name="cannot_edit_original" msgid="5890293845882609388">"मूल सम्पादन गर्न सक्दैन"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"सेटिङ वालपेपर"</string>
-    <string name="download_failure" msgid="5923323939788582895">"फà¥\8bà¤\9fà¥\8b डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
+    <string name="download_failure" msgid="5923323939788582895">"तसà¥\8dबिर डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
     <string name="original" msgid="3524493791230430897">"मूल"</string>
     <string name="borders" msgid="2067345080568684614">"किनाराहरू"</string>
     <string name="custom_border" msgid="8679893731790931871">"अनुकूलन"</string>
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"कस्टम रङ्ग छान्नुहोस्"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"रङ्ग छान्नुहोस्"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"साइज चयन गर्नुहोस्"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"ठिक छ"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठà¥\80क छ"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"मूल"</string>
     <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सुरक्षित गर्दै"</string>

diff --git a/res/values-pa-rIN/filtershow_strings.xml b/res/values-pa-rIN/filtershow_strings.xml
index 0c96041..bfb205e 100644 (file)
--- a/res/values-pa-rIN/filtershow_strings.xml
+++ b/res/values-pa-rIN/filtershow_strings.xml
@@ -22,11 +22,11 @@
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"ਵਾਲਪੇਪਰ ਸੈਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="download_failure" msgid="5923323939788582895">"ਫੋਟੋ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਨੈਟਵਰਕ ਅਣਉਪਲਬਧ।"</string>
+    <string name="download_failure" msgid="5923323939788582895">"ਫà©\8bà¨\9fà©\8b ਡਾà¨\8aਨਲà©\8bਡ ਨਹà©\80à¨\82 à¨\95ਰ ਸà¨\95ਿà¨\86। ਨà©\88ੱà¨\9fਵਰà¨\95 à¨\85ਣà¨\89ਪਲਬਧ।"</string>
     <string name="original" msgid="3524493791230430897">"ਮੂਲ"</string>
     <string name="borders" msgid="2067345080568684614">"ਬੌਰਡਰਸ"</string>
     <string name="custom_border" msgid="8679893731790931871">"ਕਸਟਮ"</string>
-    <string name="filtershow_undo" msgid="6781743189243585101">"ਪਹਿਲਾà¨\82 ਵਰà¨\97ਾ ਕਰੋ"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"à¨\85ਣà¨\95à©\80ਤਾ ਕਰੋ"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"ਰੀਡੂ ਕਰੋ"</string>
     <string name="show_imagestate_panel" msgid="281932769701043015">"ਲਾਗੂ ਕੀਤੇ ਇਫੈਕਟ ਦਿਖਾਓ"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"ਲਾਗੂ ਕੀਤੇ ਇਫੈਕਟਸ ਲੁਕਾਓ"</string>
@@ -40,17 +40,17 @@
     <string name="menu_settings" msgid="6428291655769260831">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="unsaved" msgid="8704442449002374375">"ਇਸ ਚਿੱਤਰ ਵਿੱਚ ਬਿਨਾਂ ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਬਦਲਾਵ ਹਨ।"</string>
     <string name="save_before_exit" msgid="2680660633675916712">"ਕੀ ਤੁਸੀਂ ਬਾਹਰ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਸੁਰੱਖਿਅਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="save_and_exit" msgid="3628425023766687419">"ਸà©\81ਰੱà¨\96ਿà¨\85ਤ à¨\95ਰà©\8b à¨\85ਤà©\87 ਬਾਹਰ à¨\9cਾà¨\93"</string>
-    <string name="save_and_processing" msgid="6371565035837463194">"ਪà©\82ਰà©\87 ਰਿà¨\9c਼à©\8bਲà©\82ਸ਼ਨ ਚਿੱਤਰ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"ਰੱਖਿਅਤ ਕਰੋ ਅਤੇ ਬਾਹਰ ਜਾਓ"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"ਪà©\82ਰà©\87 ਰà©\88à¨\9c਼à©\8bਲਿà¨\8aਸ਼ਨ ਚਿੱਤਰ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="exit" msgid="242642957038770113">"ਬਾਹਰ ਜਾਓ"</string>
     <string name="history" msgid="455767361472692409">"ਇਤਿਹਾਸ"</string>
-    <string name="reset" msgid="9013181350779592937">"ਰੀਸੈਟ ਕਰੋ"</string>
+    <string name="reset" msgid="9013181350779592937">"ਰà©\80ਸà©\88ੱà¨\9f à¨\95ਰà©\8b"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"ਲਾਗੂ ਕੀਤੇ ਇਫੈਕਟ"</string>
     <string name="compare_original" msgid="8140838959007796977">"ਤੁਲਨਾ ਕਰੋ"</string>
     <string name="apply_effect" msgid="1218288221200568947">"ਲਾਗੂ ਕਰੋ"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"ਰੀਸੈਟ ਕਰੋ"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"ਰà©\80ਸà©\88ੱà¨\9f à¨\95ਰà©\8b"</string>
     <string name="aspect" msgid="4025244950820813059">"ਅਸਪੈਕਟ"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
     <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
@@ -131,7 +131,7 @@
     <string name="state_panel_result" msgid="318640531123298676">"ਨਤੀਜਾ"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"ਚਿੱਤਰ ਸੁਰੱਖਿਅਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="filtershow_notification_message" msgid="2661871765484036286">"ਪ੍ਰਕਿਰਿਆ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="filtershow_save_preset" msgid="3933550455577927439">"ਮà©\8cà¨\9cà©\82ਦਾ ਪà©\8dਰà©\80ਸà©\88à¨\9f ਸà©\81ਰੱà¨\96ਿà¨\85ਤ à¨\95ਰà©\8b"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"ਮੌਜੂਦਾ ਪ੍ਰੀਸੈਟ ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="filtershow_manage_preset" msgid="3872896753708921286">"ਉਪਭੋਗਤਾ ਪ੍ਰੀਸੈਟਸ ਵਿਵਸਥਿਤ ਕਰੋੇ"</string>
     <string name="filtershow_new_preset" msgid="8923930134923416617">"ਨਵਾਂ ਪ੍ਰੀਸੈਟ"</string>
     <string name="filtershow_preset_name" msgid="7015939727047649866">"ਨਾਮ ਪ੍ਰੀਸੈਟ ਕਰੋ"</string>
@@ -139,7 +139,7 @@
     <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ਚਿੱਤਰ ਨਾਮ"</string>
     <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"ਚਿੱਤਰ ਆਕਾਰ"</string>
     <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"ਹਿਸਟੋਗ੍ਰਾਮ"</string>
-    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ਡਾਟਾ"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ਡà©\88ਟਾ"</string>
     <string name="filtershow_add_button_looks" msgid="8630823661416925426">"ਪ੍ਰੀਸੈਟ"</string>
     <string name="filtershow_add_button_versions" msgid="7620107266685809612">"ਵਰਜਨ"</string>
     <string name="filtershow_version_original" msgid="1413894292200912828">"ਮੂਲ"</string>

diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml
index 10836f7..99c1ffa 100644 (file)
--- a/res/values-ro/filtershow_strings.xml
+++ b/res/values-ro/filtershow_strings.xml
@@ -44,13 +44,13 @@
     <string name="save_and_processing" msgid="6371565035837463194">"Se procesează imaginea la rezoluție maximă..."</string>
     <string name="exit" msgid="242642957038770113">"Ieșiți"</string>
     <string name="history" msgid="455767361472692409">"Istoric"</string>
-    <string name="reset" msgid="9013181350779592937">"Resetaţi"</string>
+    <string name="reset" msgid="9013181350779592937">"Resetați"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Efecte aplicate"</string>
     <string name="compare_original" msgid="8140838959007796977">"Comparați"</string>
-    <string name="apply_effect" msgid="1218288221200568947">"Aplicaţi"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"Resetaţi"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Aplicați"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Resetați"</string>
     <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
     <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
     <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index 4371374..1fcd300 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 import android.widget.Toast;
 
 import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
index 5d3856e..8482eac 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
@@ -18,11 +18,11 @@ package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
index 0a615af..4d5a79c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
@@ -26,11 +26,11 @@ import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 import android.util.Log;
 
 import com.android.gallery3d.R;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
index e94e2a6..3c54456 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v8.renderscript.*;
+import android.renderscript.*;
 import android.util.Log;
 import android.content.res.Resources;
 import com.android.gallery3d.R;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
index e0b4cf6..0d0dd3b 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
@@ -24,11 +24,11 @@ import android.graphics.Rect;
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 import android.util.Log;
 
 public class ImageFilterVignette extends ImageFilterRS {

diff --git a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
index c378eb9..a487a5d 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 import android.util.Log;
 import com.android.gallery3d.filtershow.cache.BitmapCache;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
index 8ae9a7c..2923e3b 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
@@ -24,8 +24,8 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 import android.util.Log;
 
 import com.android.gallery3d.filtershow.cache.BitmapCache;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java b/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
index ebf83b7..0b84f52 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 
 import com.android.gallery3d.app.Log;
 import com.android.gallery3d.filtershow.cache.BitmapCache;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 4765a59..9166ee3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import android.util.Log;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java b/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
index d53768c..ad59e0c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 
 public interface PipelineInterface {
     public String getName();

diff --git a/src/com/android/gallery3d/ingest/data/MtpDeviceIndex.java b/src/com/android/gallery3d/ingest/data/MtpDeviceIndex.java
index b21ad83..ebfbc92 100644 (file)
--- a/src/com/android/gallery3d/ingest/data/MtpDeviceIndex.java
+++ b/src/com/android/gallery3d/ingest/data/MtpDeviceIndex.java
@@ -3,10 +3,15 @@ package com.android.gallery3d.ingest.data;
 import android.annotation.TargetApi;
 import android.mtp.MtpConstants;
 import android.mtp.MtpDevice;
+import android.mtp.MtpObjectInfo;
 import android.os.Build;
+import android.webkit.MimeTypeMap;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -84,12 +89,18 @@ public class MtpDeviceIndex {
     supportedImageFormats.add(MtpConstants.FORMAT_PNG);
     supportedImageFormats.add(MtpConstants.FORMAT_GIF);
     supportedImageFormats.add(MtpConstants.FORMAT_BMP);
+    supportedImageFormats.add(MtpConstants.FORMAT_TIFF);
+    supportedImageFormats.add(MtpConstants.FORMAT_TIFF_EP);
+    if (Build.VERSION.SDK_INT >= 24) {
+      supportedImageFormats.add(MtpConstants.FORMAT_DNG);
+    }
     SUPPORTED_IMAGE_FORMATS = Collections.unmodifiableSet(supportedImageFormats);
 
     Set<Integer> supportedVideoFormats = new HashSet<Integer>();
     supportedVideoFormats.add(MtpConstants.FORMAT_3GP_CONTAINER);
     supportedVideoFormats.add(MtpConstants.FORMAT_AVI);
     supportedVideoFormats.add(MtpConstants.FORMAT_MP4_CONTAINER);
+    supportedVideoFormats.add(MtpConstants.FORMAT_MP2);
     supportedVideoFormats.add(MtpConstants.FORMAT_MPEG);
     // TODO(georgescu): add FORMAT_MOV once Android Media Scanner supports .mov files
     SUPPORTED_VIDEO_FORMATS = Collections.unmodifiableSet(supportedVideoFormats);
@@ -104,6 +115,8 @@ public class MtpDeviceIndex {
   private static final MtpDeviceIndex sInstance = new MtpDeviceIndex(
       MtpDeviceIndexRunnable.getFactory());
 
+  private static final Map<String, Boolean> sCachedSupportedExtenstions = new HashMap<>();
+
   public static MtpDeviceIndex getInstance() {
     return sInstance;
   }
@@ -121,12 +134,41 @@ public class MtpDeviceIndex {
   }
 
   /**
-   * @param format Media format from {@link MtpConstants}
+   * @param mtpObjectInfo MTP object info
    * @return Whether the format is supported by this index.
    */
-  public boolean isFormatSupported(int format) {
-    return SUPPORTED_IMAGE_FORMATS.contains(format)
-        || SUPPORTED_VIDEO_FORMATS.contains(format);
+  public boolean isFormatSupported(MtpObjectInfo mtpObjectInfo) {
+    // Checks whether the format is supported or not.
+    final int format = mtpObjectInfo.getFormat();
+    if (SUPPORTED_IMAGE_FORMATS.contains(format)
+        || SUPPORTED_VIDEO_FORMATS.contains(format)) {
+      return true;
+    }
+
+    // Checks whether the extension is supported or not.
+    final String name = mtpObjectInfo.getName();
+    if (name == null) {
+      return false;
+    }
+    final int lastDot = name.lastIndexOf('.');
+    if (lastDot >= 0) {
+      final String extension = name.substring(lastDot + 1);
+
+      Boolean result = sCachedSupportedExtenstions.get(extension);
+      if (result != null) {
+        return result;
+      }
+      final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+          extension.toLowerCase(Locale.US));
+      if (mime != null) {
+        // This will also accept the newly added mimetypes for images and videos.
+        result = mime.startsWith("image/") || mime.startsWith("video/");
+        sCachedSupportedExtenstions.put(extension, result);
+        return result;
+      }
+    }
+
+    return false;
   }
 
   /**

diff --git a/src/com/android/gallery3d/ingest/data/MtpDeviceIndexRunnable.java b/src/com/android/gallery3d/ingest/data/MtpDeviceIndexRunnable.java
index 3227589..fe55815 100644 (file)
--- a/src/com/android/gallery3d/ingest/data/MtpDeviceIndexRunnable.java
+++ b/src/com/android/gallery3d/ingest/data/MtpDeviceIndexRunnable.java
@@ -171,10 +171,9 @@ public class MtpDeviceIndexRunnable implements Runnable {
           if (mtpObjectInfo == null) {
             throw new IndexingException();
           }
-          int format = mtpObjectInfo.getFormat();
-          if (format == MtpConstants.FORMAT_ASSOCIATION) {
+          if (mtpObjectInfo.getFormat() == MtpConstants.FORMAT_ASSOCIATION) {
             pendingDirectories.add(objectHandle);
-          } else if (mIndex.isFormatSupported(format)) {
+          } else if (mIndex.isFormatSupported(mtpObjectInfo)) {
             numObjects++;
             addObject(new IngestObjectInfo(mtpObjectInfo), bucketsTemp, numObjects);
           }