diff options
73 files changed, 720 insertions, 149 deletions
diff --git a/res/drawable-nodpi/brush1.png b/res/drawable-nodpi/brush1.png Binary files differdeleted file mode 100644 index 6030f25de..000000000 --- a/res/drawable-nodpi/brush1.png +++ /dev/null diff --git a/res/drawable-nodpi/brush_marker.png b/res/drawable-nodpi/brush_marker.png Binary files differnew file mode 100644 index 000000000..24eb7476c --- /dev/null +++ b/res/drawable-nodpi/brush_marker.png diff --git a/res/drawable-nodpi/brush2.png b/res/drawable-nodpi/brush_spatter.png Binary files differindex ae15c221c..ae15c221c 100644 --- a/res/drawable-nodpi/brush2.png +++ b/res/drawable-nodpi/brush_spatter.png diff --git a/res/layout-land/photo_module_content.xml b/res/layout-land/photo_module_content.xml index 2afcf4081..d734f8329 100644 --- a/res/layout-land/photo_module_content.xml +++ b/res/layout-land/photo_module_content.xml @@ -37,14 +37,14 @@ android:layout_width="80dip" android:layout_height="80dip" android:layout_marginTop="-5dip" - android:layout_marginRight="-2dip" + android:layout_marginRight="-2dip" android:layout_gravity="top|right"/> <include layout="@layout/review_module_control" android:layout_marginRight="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml index 8dcdc848c..972a7f901 100644 --- a/res/layout-land/video_module.xml +++ b/res/layout-land/video_module.xml @@ -45,7 +45,7 @@ <include layout="@layout/review_module_control" android:layout_marginRight="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:layout_alignParentRight="true" diff --git a/res/layout-port/photo_module_content.xml b/res/layout-port/photo_module_content.xml index 79438a5d0..a82a7a138 100644 --- a/res/layout-port/photo_module_content.xml +++ b/res/layout-port/photo_module_content.xml @@ -43,7 +43,7 @@ <include layout="@layout/review_module_control" android:layout_marginBottom="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:layout_gravity="bottom|right" diff --git a/res/layout-port/video_module.xml b/res/layout-port/video_module.xml index 7aedb8c4b..d8a6490d4 100644 --- a/res/layout-port/video_module.xml +++ b/res/layout-port/video_module.xml @@ -45,7 +45,7 @@ <include layout="@layout/review_module_control" android:layout_marginBottom="2dip" /> - <View + <com.android.camera.ui.PieMenuButton android:id="@+id/menu" style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml index e4756ab81..9606d9129 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/filtershow_activity.xml @@ -52,7 +52,6 @@ android:id="@+id/mainPanel" android:layout_width="match_parent" android:layout_height="match_parent" - android:layerType="hardware" android:orientation="vertical" > <FrameLayout @@ -100,37 +99,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <com.android.gallery3d.filtershow.imageshow.ImageRedEyes - android:id="@+id/imageRedEyes" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" /> - <com.android.gallery3d.filtershow.imageshow.ImageDraw android:id="@+id/imageDraw" android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" /> - <com.android.gallery3d.filtershow.CenteredLinearLayout - xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - custom:max_width="600dip" - android:orientation="vertical"> - - <SeekBar - android:id="@+id/filterSeekBar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:padding="16dip" - android:visibility="gone" /> - - </com.android.gallery3d.filtershow.CenteredLinearLayout> - <ProgressBar android:id="@+id/loading" style="@android:style/Widget.Holo.ProgressBar.Large" @@ -265,13 +239,6 @@ android:drawableTop="@drawable/filtershow_button_geometry_flip" android:text="@string/mirror" /> - <com.android.gallery3d.filtershow.ui.IconButton - android:id="@+id/redEyeButton" - android:layout_height="match_parent" - style="@style/IconButton" - android:drawableTop="@drawable/photoeditor_effect_redeye" - android:text="@string/redeye" /> - </LinearLayout> </HorizontalScrollView> diff --git a/res/layout/filtershow_tiny_planet_editor.xml b/res/layout/filtershow_tiny_planet_editor.xml new file mode 100644 index 000000000..a99e406a9 --- /dev/null +++ b/res/layout/filtershow_tiny_planet_editor.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2013 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:iconbutton="http://schemas.android.com/apk/res/com.android.gallery3d" + android:id="@+id/tinyPlanetEditor" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" > + + <com.android.gallery3d.filtershow.imageshow.ImageTinyPlanet + android:id="@+id/imageTinyPlanet" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <com.android.gallery3d.filtershow.CenteredLinearLayout + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" + android:background="@android:color/transparent" + custom:max_width="600dip" + android:orientation="vertical"> + + <SeekBar + android:id="@+id/filterSeekBar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:padding="16dip"/> + </com.android.gallery3d.filtershow.CenteredLinearLayout> + </FrameLayout>
\ No newline at end of file diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml index efb8747f9..4ea7d17fd 100644 --- a/res/menu/filtershow_activity_menu.xml +++ b/res/menu/filtershow_activity_menu.xml @@ -27,6 +27,6 @@ <item android:id="@+id/showImageStateButton" android:showAsAction="never" - android:visible="false" + android:visible="true" android:title="@string/show_imagestate_panel" /> </menu> diff --git a/res/menu/filtershow_menu_draw.xml b/res/menu/filtershow_menu_draw.xml index be6dc7058..2960c1f05 100644 --- a/res/menu/filtershow_menu_draw.xml +++ b/res/menu/filtershow_menu_draw.xml @@ -22,14 +22,20 @@ android:id="@+id/draw_menu_style_line" android:title="@string/draw_style_line" /> <item - android:id="@+id/draw_menu_style_brush" - android:title="@string/draw_style_brush" /> + android:id="@+id/draw_menu_style_brush_marker" + android:title="@string/draw_style_brush_marker"/> + <item + android:id="@+id/draw_menu_style_brush_spatter" + android:title="@string/draw_style_brush_spatter"/> <item android:id="@+id/draw_menu_size" android:title="@string/draw_size" /> <item android:id="@+id/draw_menu_color" android:title="@string/draw_color"/> + <item + android:id="@+id/draw_menu_clear" + android:title="@string/draw_clear"/> </group> </menu>
\ No newline at end of file diff --git a/res/values-af/filtershow_strings.xml b/res/values-af/filtershow_strings.xml index 504ad9b48..db3e16f6b 100644 --- a/res/values-af/filtershow_strings.xml +++ b/res/values-af/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Grootte"</string> <string name="draw_color" msgid="2119030386987211193">"Kleur"</string> <string name="draw_style_line" msgid="9216476853904429628">"Lyne"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Kwas"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Kies gepasmaakte kleur"</string> <string name="color_pick_title" msgid="6195567431995308876">"Kies kleur"</string> <string name="draw_size_title" msgid="3121649039610273977">"Kies grootte"</string> diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml index 83e2efaf3..fedc4640f 100644 --- a/res/values-am/filtershow_strings.xml +++ b/res/values-am/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"መጠን"</string> <string name="draw_color" msgid="2119030386987211193">"ቀለም"</string> <string name="draw_style_line" msgid="9216476853904429628">"መስመሮች"</string> - <string name="draw_style_brush" msgid="383079660590023404">"ብሩሽ"</string> + <!-- 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 /> <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-ar/filtershow_strings.xml b/res/values-ar/filtershow_strings.xml index c7b7416a4..e1c54d086 100644 --- a/res/values-ar/filtershow_strings.xml +++ b/res/values-ar/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"الحجم"</string> <string name="draw_color" msgid="2119030386987211193">"اللون"</string> <string name="draw_style_line" msgid="9216476853904429628">"الأسطر"</string> - <string name="draw_style_brush" msgid="383079660590023404">"الفرشاة"</string> + <!-- 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 /> <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-be/filtershow_strings.xml b/res/values-be/filtershow_strings.xml index 3429c953b..93a998afa 100644 --- a/res/values-be/filtershow_strings.xml +++ b/res/values-be/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Памер"</string> <string name="draw_color" msgid="2119030386987211193">"Колер"</string> <string name="draw_style_line" msgid="9216476853904429628">"Лiнii"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Пэндзаль"</string> + <!-- 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 /> <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-bg/filtershow_strings.xml b/res/values-bg/filtershow_strings.xml index 9fae8a632..c9c132337 100644 --- a/res/values-bg/filtershow_strings.xml +++ b/res/values-bg/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Размер"</string> <string name="draw_color" msgid="2119030386987211193">"Цвят"</string> <string name="draw_style_line" msgid="9216476853904429628">"Линии"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Четка"</string> + <!-- 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 /> <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-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml index ec50c416f..81e4a7230 100644 --- a/res/values-ca/filtershow_strings.xml +++ b/res/values-ca/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Mida"</string> <string name="draw_color" msgid="2119030386987211193">"Color"</string> <string name="draw_style_line" msgid="9216476853904429628">"Línies"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pinzell"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Tria un color personalitzat"</string> <string name="color_pick_title" msgid="6195567431995308876">"Selecció del color"</string> <string name="draw_size_title" msgid="3121649039610273977">"Selecció de la mida"</string> diff --git a/res/values-cs/filtershow_strings.xml b/res/values-cs/filtershow_strings.xml index 54922f7c0..a79eb4216 100644 --- a/res/values-cs/filtershow_strings.xml +++ b/res/values-cs/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Velikost"</string> <string name="draw_color" msgid="2119030386987211193">"Barva"</string> <string name="draw_style_line" msgid="9216476853904429628">"Čáry"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Štětec"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Zvolit vlastní barvu"</string> <string name="color_pick_title" msgid="6195567431995308876">"Vyberte barvu"</string> <string name="draw_size_title" msgid="3121649039610273977">"Vyberte velikost"</string> diff --git a/res/values-da/filtershow_strings.xml b/res/values-da/filtershow_strings.xml index 41b5f029f..8dd9c0ad9 100644 --- a/res/values-da/filtershow_strings.xml +++ b/res/values-da/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Størrelse"</string> <string name="draw_color" msgid="2119030386987211193">"Farve"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Børste"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Vælg tilpasset farve"</string> <string name="color_pick_title" msgid="6195567431995308876">"Vælg farve"</string> <string name="draw_size_title" msgid="3121649039610273977">"Vælg størrelse"</string> diff --git a/res/values-de/filtershow_strings.xml b/res/values-de/filtershow_strings.xml index 89168f2c8..59953f055 100644 --- a/res/values-de/filtershow_strings.xml +++ b/res/values-de/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Größe"</string> <string name="draw_color" msgid="2119030386987211193">"Farbe"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linien"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pinsel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Benutzerdefinierte Farbe wählen"</string> <string name="color_pick_title" msgid="6195567431995308876">"Farbe auswählen"</string> <string name="draw_size_title" msgid="3121649039610273977">"Größe auswählen"</string> diff --git a/res/values-el/filtershow_strings.xml b/res/values-el/filtershow_strings.xml index edef41d14..755d2534d 100644 --- a/res/values-el/filtershow_strings.xml +++ b/res/values-el/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Μέγεθος"</string> <string name="draw_color" msgid="2119030386987211193">"Χρώμα"</string> <string name="draw_style_line" msgid="9216476853904429628">"Γραμμές"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Πινέλο"</string> + <!-- 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 /> <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-en-rGB/filtershow_strings.xml b/res/values-en-rGB/filtershow_strings.xml index 24688bcd2..b1d89b60f 100644 --- a/res/values-en-rGB/filtershow_strings.xml +++ b/res/values-en-rGB/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Size"</string> <string name="draw_color" msgid="2119030386987211193">"Colour"</string> <string name="draw_style_line" msgid="9216476853904429628">"Lines"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Brush"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Choose custom colour"</string> <string name="color_pick_title" msgid="6195567431995308876">"Select Colour"</string> <string name="draw_size_title" msgid="3121649039610273977">"Select Size"</string> diff --git a/res/values-es-rUS/filtershow_strings.xml b/res/values-es-rUS/filtershow_strings.xml index 7546189fb..9fdc96585 100644 --- a/res/values-es-rUS/filtershow_strings.xml +++ b/res/values-es-rUS/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Tamaño"</string> <string name="draw_color" msgid="2119030386987211193">"Color"</string> <string name="draw_style_line" msgid="9216476853904429628">"Líneas"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pincel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Elegir un color personalizado"</string> <string name="color_pick_title" msgid="6195567431995308876">"Seleccionar color"</string> <string name="draw_size_title" msgid="3121649039610273977">"Seleccionar tamaño"</string> diff --git a/res/values-es/filtershow_strings.xml b/res/values-es/filtershow_strings.xml index 9a41fa606..ef030e601 100644 --- a/res/values-es/filtershow_strings.xml +++ b/res/values-es/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Tamaño"</string> <string name="draw_color" msgid="2119030386987211193">"Color"</string> <string name="draw_style_line" msgid="9216476853904429628">"Líneas"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Brocha"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Elegir un color personalizado"</string> <string name="color_pick_title" msgid="6195567431995308876">"Seleccionar color"</string> <string name="draw_size_title" msgid="3121649039610273977">"Seleccionar tamaño"</string> diff --git a/res/values-et/filtershow_strings.xml b/res/values-et/filtershow_strings.xml index b312779ab..47108f05a 100644 --- a/res/values-et/filtershow_strings.xml +++ b/res/values-et/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Suurus"</string> <string name="draw_color" msgid="2119030386987211193">"Värv"</string> <string name="draw_style_line" msgid="9216476853904429628">"Jooned"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pintsel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Valige kohandatud värv"</string> <string name="color_pick_title" msgid="6195567431995308876">"Värvi valimine"</string> <string name="draw_size_title" msgid="3121649039610273977">"Suuruse valimine"</string> diff --git a/res/values-fa/filtershow_strings.xml b/res/values-fa/filtershow_strings.xml index 8c22e21da..4acf880f2 100644 --- a/res/values-fa/filtershow_strings.xml +++ b/res/values-fa/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"اندازه"</string> <string name="draw_color" msgid="2119030386987211193">"رنگ"</string> <string name="draw_style_line" msgid="9216476853904429628">"خطوط"</string> - <string name="draw_style_brush" msgid="383079660590023404">"قلم مو"</string> + <!-- 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 /> <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-fi/filtershow_strings.xml b/res/values-fi/filtershow_strings.xml index e12ba7df2..0f5908fb9 100644 --- a/res/values-fi/filtershow_strings.xml +++ b/res/values-fi/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Koko"</string> <string name="draw_color" msgid="2119030386987211193">"Väri"</string> <string name="draw_style_line" msgid="9216476853904429628">"Viivat"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Sivellin"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Valitse oma väri"</string> <string name="color_pick_title" msgid="6195567431995308876">"Valitse väri"</string> <string name="draw_size_title" msgid="3121649039610273977">"Valitse koko"</string> diff --git a/res/values-fr/filtershow_strings.xml b/res/values-fr/filtershow_strings.xml index 89ba5357a..5f33d5fd8 100644 --- a/res/values-fr/filtershow_strings.xml +++ b/res/values-fr/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Taille"</string> <string name="draw_color" msgid="2119030386987211193">"Couleur"</string> <string name="draw_style_line" msgid="9216476853904429628">"Lignes"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pinceau"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Sélection couleur personnalisée"</string> <string name="color_pick_title" msgid="6195567431995308876">"Sélectionner couleur"</string> <string name="draw_size_title" msgid="3121649039610273977">"Sélectionner la taille"</string> diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml index 28f03cd9e..e2c55a519 100644 --- a/res/values-hi/filtershow_strings.xml +++ b/res/values-hi/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"आकार"</string> <string name="draw_color" msgid="2119030386987211193">"रंग"</string> <string name="draw_style_line" msgid="9216476853904429628">"रेखाएं"</string> - <string name="draw_style_brush" msgid="383079660590023404">"ब्रश"</string> + <!-- 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 /> <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-hr/filtershow_strings.xml b/res/values-hr/filtershow_strings.xml index a27dd434b..f1cab947d 100644 --- a/res/values-hr/filtershow_strings.xml +++ b/res/values-hr/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Veličina"</string> <string name="draw_color" msgid="2119030386987211193">"Boja"</string> <string name="draw_style_line" msgid="9216476853904429628">"Crte"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Kist"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Odabir prilagođene boje"</string> <string name="color_pick_title" msgid="6195567431995308876">"Odabir boje"</string> <string name="draw_size_title" msgid="3121649039610273977">"Odabir veličine"</string> diff --git a/res/values-hu/filtershow_strings.xml b/res/values-hu/filtershow_strings.xml index 3d34e451e..58e3fb77f 100644 --- a/res/values-hu/filtershow_strings.xml +++ b/res/values-hu/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Méret"</string> <string name="draw_color" msgid="2119030386987211193">"Szín"</string> <string name="draw_style_line" msgid="9216476853904429628">"Vonalak"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Ecset"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Egyéni szín kiválasztása"</string> <string name="color_pick_title" msgid="6195567431995308876">"Szín kiválasztása"</string> <string name="draw_size_title" msgid="3121649039610273977">"Méret kiválasztása"</string> diff --git a/res/values-in/filtershow_strings.xml b/res/values-in/filtershow_strings.xml index 788b49902..6b2d44eb7 100644 --- a/res/values-in/filtershow_strings.xml +++ b/res/values-in/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Ukuran"</string> <string name="draw_color" msgid="2119030386987211193">"Warna"</string> <string name="draw_style_line" msgid="9216476853904429628">"Garis"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Kuas"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Pilih warna khusus"</string> <string name="color_pick_title" msgid="6195567431995308876">"Pilih Warna"</string> <string name="draw_size_title" msgid="3121649039610273977">"Pilih Ukuran"</string> diff --git a/res/values-it/filtershow_strings.xml b/res/values-it/filtershow_strings.xml index 76f04f6aa..a1b951fc0 100644 --- a/res/values-it/filtershow_strings.xml +++ b/res/values-it/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Dimensioni"</string> <string name="draw_color" msgid="2119030386987211193">"Colore"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linee"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pennello"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Scegli colore personalizzato"</string> <string name="color_pick_title" msgid="6195567431995308876">"Seleziona colore"</string> <string name="draw_size_title" msgid="3121649039610273977">"Seleziona dimensioni"</string> diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml index 757910f4f..587a7c4ea 100644 --- a/res/values-iw/filtershow_strings.xml +++ b/res/values-iw/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"גודל"</string> <string name="draw_color" msgid="2119030386987211193">"צבע"</string> <string name="draw_style_line" msgid="9216476853904429628">"קווים"</string> - <string name="draw_style_brush" msgid="383079660590023404">"מברשת"</string> + <!-- 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 /> <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-ja/filtershow_strings.xml b/res/values-ja/filtershow_strings.xml index 918c1cb05..4b5407c19 100644 --- a/res/values-ja/filtershow_strings.xml +++ b/res/values-ja/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"サイズ"</string> <string name="draw_color" msgid="2119030386987211193">"色"</string> <string name="draw_style_line" msgid="9216476853904429628">"線"</string> - <string name="draw_style_brush" msgid="383079660590023404">"ブラシ"</string> + <!-- 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 /> <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-ja/strings.xml b/res/values-ja/strings.xml index 74bf26eb5..a9b81073b 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -249,7 +249,7 @@ <string name="pref_video_time_lapse_frame_interval_title" msgid="6245716906744079302">"低速度撮影"</string> <string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string> <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string> - <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"表示サイズ"</string> + <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"画像サイズ"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Mピクセル"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5メガピクセル"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3メガピクセル"</string> diff --git a/res/values-ko/filtershow_strings.xml b/res/values-ko/filtershow_strings.xml index 77005201c..87ae16399 100644 --- a/res/values-ko/filtershow_strings.xml +++ b/res/values-ko/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"크기"</string> <string name="draw_color" msgid="2119030386987211193">"색상"</string> <string name="draw_style_line" msgid="9216476853904429628">"선"</string> - <string name="draw_style_brush" msgid="383079660590023404">"브러시"</string> + <!-- 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 /> <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-lt/filtershow_strings.xml b/res/values-lt/filtershow_strings.xml index 83f0534e7..7fc4a9b17 100644 --- a/res/values-lt/filtershow_strings.xml +++ b/res/values-lt/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Dydis"</string> <string name="draw_color" msgid="2119030386987211193">"Spalva"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linijos"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Teptukas"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Pasirinkti tinkintą spalvą"</string> <string name="color_pick_title" msgid="6195567431995308876">"Pasirinkti spalvą"</string> <string name="draw_size_title" msgid="3121649039610273977">"Pasirinkti dydį"</string> diff --git a/res/values-lv/filtershow_strings.xml b/res/values-lv/filtershow_strings.xml index 110ae18e6..2fac56010 100644 --- a/res/values-lv/filtershow_strings.xml +++ b/res/values-lv/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Izmēri"</string> <string name="draw_color" msgid="2119030386987211193">"Krāsa"</string> <string name="draw_style_line" msgid="9216476853904429628">"Līnijas"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Ota"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Izvēlēties pielāgotu krāsu"</string> <string name="color_pick_title" msgid="6195567431995308876">"Krāsas atlase"</string> <string name="draw_size_title" msgid="3121649039610273977">"Izmēru atlase"</string> diff --git a/res/values-ms/filtershow_strings.xml b/res/values-ms/filtershow_strings.xml index 9f719cd2a..d612d41b1 100644 --- a/res/values-ms/filtershow_strings.xml +++ b/res/values-ms/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Saiz"</string> <string name="draw_color" msgid="2119030386987211193">"Warna"</string> <string name="draw_style_line" msgid="9216476853904429628">"Garisan"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Berus"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Pilih warna peribadi"</string> <string name="color_pick_title" msgid="6195567431995308876">"Pilih Warna"</string> <string name="draw_size_title" msgid="3121649039610273977">"Pilih Saiz"</string> diff --git a/res/values-nb/filtershow_strings.xml b/res/values-nb/filtershow_strings.xml index 163ee6436..c8884b736 100644 --- a/res/values-nb/filtershow_strings.xml +++ b/res/values-nb/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Størrelse"</string> <string name="draw_color" msgid="2119030386987211193">"Farge"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pensel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Velg egendefinert farge"</string> <string name="color_pick_title" msgid="6195567431995308876">"Velg farge"</string> <string name="draw_size_title" msgid="3121649039610273977">"Velg størrelse"</string> diff --git a/res/values-nl/filtershow_strings.xml b/res/values-nl/filtershow_strings.xml index 3002f8e3a..270e190e3 100644 --- a/res/values-nl/filtershow_strings.xml +++ b/res/values-nl/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Grootte"</string> <string name="draw_color" msgid="2119030386987211193">"Kleur"</string> <string name="draw_style_line" msgid="9216476853904429628">"Lijnen"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Penseel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Aangepaste kleur kiezen"</string> <string name="color_pick_title" msgid="6195567431995308876">"Kleur selecteren"</string> <string name="draw_size_title" msgid="3121649039610273977">"Formaat selecteren"</string> diff --git a/res/values-pl/filtershow_strings.xml b/res/values-pl/filtershow_strings.xml index 0f1220f16..5a2cf631a 100644 --- a/res/values-pl/filtershow_strings.xml +++ b/res/values-pl/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Rozmiar"</string> <string name="draw_color" msgid="2119030386987211193">"Kolor"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linie"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pędzel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Wybierz własny kolor"</string> <string name="color_pick_title" msgid="6195567431995308876">"Wybierz kolor"</string> <string name="draw_size_title" msgid="3121649039610273977">"Wybierz rozmiar"</string> diff --git a/res/values-pt-rPT/filtershow_strings.xml b/res/values-pt-rPT/filtershow_strings.xml index e50c9e945..6f26ded7c 100644 --- a/res/values-pt-rPT/filtershow_strings.xml +++ b/res/values-pt-rPT/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Tamanho"</string> <string name="draw_color" msgid="2119030386987211193">"Cor"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linhas"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pincel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Selecionar cor personalizada"</string> <string name="color_pick_title" msgid="6195567431995308876">"Selecionar a cor"</string> <string name="draw_size_title" msgid="3121649039610273977">"Selecionar Tamanho"</string> diff --git a/res/values-pt/filtershow_strings.xml b/res/values-pt/filtershow_strings.xml index 6e908738c..32c09877c 100644 --- a/res/values-pt/filtershow_strings.xml +++ b/res/values-pt/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Tamanho"</string> <string name="draw_color" msgid="2119030386987211193">"Cor"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linhas"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pincel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Escolha uma cor personalizada"</string> <string name="color_pick_title" msgid="6195567431995308876">"Selecionar cor"</string> <string name="draw_size_title" msgid="3121649039610273977">"Selecionar tamanho"</string> diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml index f844fcd27..377ff11bf 100644 --- a/res/values-ro/filtershow_strings.xml +++ b/res/values-ro/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Dimensiune"</string> <string name="draw_color" msgid="2119030386987211193">"Culoare"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linii"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pensulă"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Alegeți culoarea personalizată"</string> <string name="color_pick_title" msgid="6195567431995308876">"Selectați culoarea"</string> <string name="draw_size_title" msgid="3121649039610273977">"Selectați dimensiunea"</string> diff --git a/res/values-ru/filtershow_strings.xml b/res/values-ru/filtershow_strings.xml index 136d3912a..95a781f05 100644 --- a/res/values-ru/filtershow_strings.xml +++ b/res/values-ru/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Размер"</string> <string name="draw_color" msgid="2119030386987211193">"Цвет"</string> <string name="draw_style_line" msgid="9216476853904429628">"Линии"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Кисть"</string> + <!-- 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 /> <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-sk/filtershow_strings.xml b/res/values-sk/filtershow_strings.xml index c32dbd6b6..1cf311dde 100644 --- a/res/values-sk/filtershow_strings.xml +++ b/res/values-sk/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Veľkosť"</string> <string name="draw_color" msgid="2119030386987211193">"Farba"</string> <string name="draw_style_line" msgid="9216476853904429628">"Čiary"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Štetec"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Vybrať vlastnú farbu"</string> <string name="color_pick_title" msgid="6195567431995308876">"Vyberte farbu"</string> <string name="draw_size_title" msgid="3121649039610273977">"Vyberte veľkosť"</string> diff --git a/res/values-sl/filtershow_strings.xml b/res/values-sl/filtershow_strings.xml index a438a2c9f..a404c0ef3 100644 --- a/res/values-sl/filtershow_strings.xml +++ b/res/values-sl/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Velikost"</string> <string name="draw_color" msgid="2119030386987211193">"Barva"</string> <string name="draw_style_line" msgid="9216476853904429628">"Črte"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Čopič"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Izberite barvo po meri"</string> <string name="color_pick_title" msgid="6195567431995308876">"Izberite barvo"</string> <string name="draw_size_title" msgid="3121649039610273977">"Izberite velikost"</string> diff --git a/res/values-sr/filtershow_strings.xml b/res/values-sr/filtershow_strings.xml index a4f676fc1..13162603e 100644 --- a/res/values-sr/filtershow_strings.xml +++ b/res/values-sr/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Величина"</string> <string name="draw_color" msgid="2119030386987211193">"Боја"</string> <string name="draw_style_line" msgid="9216476853904429628">"Линије"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Четкица"</string> + <!-- 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 /> <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-sv/filtershow_strings.xml b/res/values-sv/filtershow_strings.xml index 1ab1e0860..a60196f84 100644 --- a/res/values-sv/filtershow_strings.xml +++ b/res/values-sv/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Storlek"</string> <string name="draw_color" msgid="2119030386987211193">"Färg"</string> <string name="draw_style_line" msgid="9216476853904429628">"Linjer"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Pensel"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Välj anpassad färg"</string> <string name="color_pick_title" msgid="6195567431995308876">"Välj färg"</string> <string name="draw_size_title" msgid="3121649039610273977">"Välj storlek"</string> diff --git a/res/values-sw/filtershow_strings.xml b/res/values-sw/filtershow_strings.xml index 4e468e96c..99e242711 100644 --- a/res/values-sw/filtershow_strings.xml +++ b/res/values-sw/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Ukubwa"</string> <string name="draw_color" msgid="2119030386987211193">"Rangi"</string> <string name="draw_style_line" msgid="9216476853904429628">"Mistari"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Brashi"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Chagua rangi maalum"</string> <string name="color_pick_title" msgid="6195567431995308876">"Chagua Rangi"</string> <string name="draw_size_title" msgid="3121649039610273977">"Chagua Ukubwa"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 4eaaac170..2bc0f5ada 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -262,7 +262,7 @@ <string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string> <string name="pref_camera_picturesize_entry_qvga" msgid="8576186463069770133">"QVGA"</string> <string name="pref_camera_focusmode_title" msgid="2877248921829329127">"Hali ya kulenga"</string> - <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Atomatiki"</string> + <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Otomatiki"</string> <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Pasipo mwisho"</string> <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Makro"</string> <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Hali ya mweka"</string> diff --git a/res/values-th/filtershow_strings.xml b/res/values-th/filtershow_strings.xml index 5ec0881a1..d309edc9b 100644 --- a/res/values-th/filtershow_strings.xml +++ b/res/values-th/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"ขนาด"</string> <string name="draw_color" msgid="2119030386987211193">"สี"</string> <string name="draw_style_line" msgid="9216476853904429628">"เส้น"</string> - <string name="draw_style_brush" msgid="383079660590023404">"แปรง"</string> + <!-- 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 /> <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-tl/filtershow_strings.xml b/res/values-tl/filtershow_strings.xml index 6d2a7cdd5..6fbb390cd 100644 --- a/res/values-tl/filtershow_strings.xml +++ b/res/values-tl/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Laki"</string> <string name="draw_color" msgid="2119030386987211193">"Kulay"</string> <string name="draw_style_line" msgid="9216476853904429628">"Mga Linya"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Brush"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Pumili ng custom na kulay"</string> <string name="color_pick_title" msgid="6195567431995308876">"Pumili ng Kulay"</string> <string name="draw_size_title" msgid="3121649039610273977">"Pumili ng Laki"</string> diff --git a/res/values-tr/filtershow_strings.xml b/res/values-tr/filtershow_strings.xml index 647f30afb..70597202f 100644 --- a/res/values-tr/filtershow_strings.xml +++ b/res/values-tr/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Boyut"</string> <string name="draw_color" msgid="2119030386987211193">"Renk"</string> <string name="draw_style_line" msgid="9216476853904429628">"Çizgi"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Fırça"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Özel renk seç"</string> <string name="color_pick_title" msgid="6195567431995308876">"Renk Seçin"</string> <string name="draw_size_title" msgid="3121649039610273977">"Boyut Seçin"</string> diff --git a/res/values-uk/filtershow_strings.xml b/res/values-uk/filtershow_strings.xml index 3b1505e4d..864846dc7 100644 --- a/res/values-uk/filtershow_strings.xml +++ b/res/values-uk/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Розмір"</string> <string name="draw_color" msgid="2119030386987211193">"Колір"</string> <string name="draw_style_line" msgid="9216476853904429628">"Лінії"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Пензель"</string> + <!-- 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 /> <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-vi/filtershow_strings.xml b/res/values-vi/filtershow_strings.xml index 5c54eb813..fa3fc1e77 100644 --- a/res/values-vi/filtershow_strings.xml +++ b/res/values-vi/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Kích thước"</string> <string name="draw_color" msgid="2119030386987211193">"Màu"</string> <string name="draw_style_line" msgid="9216476853904429628">"Đường vẽ"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Bút vẽ"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Chọn màu tùy chỉnh"</string> <string name="color_pick_title" msgid="6195567431995308876">"Chọn màu"</string> <string name="draw_size_title" msgid="3121649039610273977">"Chọn kích thước"</string> diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml index cf4c5ae1d..e3518d49b 100644 --- a/res/values-zh-rCN/filtershow_strings.xml +++ b/res/values-zh-rCN/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"大小"</string> <string name="draw_color" msgid="2119030386987211193">"颜色"</string> <string name="draw_style_line" msgid="9216476853904429628">"线条"</string> - <string name="draw_style_brush" msgid="383079660590023404">"笔刷"</string> + <!-- 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 /> <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-zh-rTW/filtershow_strings.xml b/res/values-zh-rTW/filtershow_strings.xml index 2172f25ca..fc382a15e 100644 --- a/res/values-zh-rTW/filtershow_strings.xml +++ b/res/values-zh-rTW/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"尺寸"</string> <string name="draw_color" msgid="2119030386987211193">"顏色"</string> <string name="draw_style_line" msgid="9216476853904429628">"線條"</string> - <string name="draw_style_brush" msgid="383079660590023404">"筆刷"</string> + <!-- 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 /> <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-zu/filtershow_strings.xml b/res/values-zu/filtershow_strings.xml index b2a7921f4..5dd389374 100644 --- a/res/values-zu/filtershow_strings.xml +++ b/res/values-zu/filtershow_strings.xml @@ -80,7 +80,12 @@ <string name="draw_size" msgid="4360005386104151209">"Usayizi"</string> <string name="draw_color" msgid="2119030386987211193">"Umbala"</string> <string name="draw_style_line" msgid="9216476853904429628">"Imigqa"</string> - <string name="draw_style_brush" msgid="383079660590023404">"Ibhulashi"</string> + <!-- 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 /> <string name="color_pick_select" msgid="734312818059057394">"Khetha umbala wangokwezifiso"</string> <string name="color_pick_title" msgid="6195567431995308876">"Khetha umbala"</string> <string name="draw_size_title" msgid="3121649039610273977">"Khetha usayizi"</string> diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index c444fba78..786d7ee7d 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -38,4 +38,6 @@ <item type="id" name="imageCurves" /> <item type="id" name="imageZoom" /> <item type="id" name="editorDraw" /> + <item type="id" name="editorRedEye" /> + <item type="id" name="imageOnlyEditor" /> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 92cc06a0f..66fb3902d 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -162,8 +162,12 @@ <string name="draw_color">Color</string> <!-- Label for the line style of drawing in [CHAR LIMIT=14] --> <string name="draw_style_line">Lines</string> - <!-- Label for the brush style of drawing in [CHAR LIMIT=14] --> - <string name="draw_style_brush">Brush</string> + <!-- Label for the Marker brush style of drawing in [CHAR LIMIT=14] --> + <string name="draw_style_brush_spatter">Marker</string> + <!-- Label for the Spatter brush style of drawing in [CHAR LIMIT=14] --> + <string name="draw_style_brush_marker">Spatter</string> + <!-- Label for the removing drawing from screen [CHAR LIMIT=14] --> + <string name="draw_clear">Clear</string> <!-- Label for the select the color [CHAR LIMIT=30] --> <string name="color_pick_select">Choose custom color</string> diff --git a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java index f6f308dba..2410ebe72 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java @@ -121,4 +121,8 @@ public class FilterBasicRepresentation extends FilterRepresentation { public void setPreviewValue(int previewValue) { mPreviewValue = previewValue; } + + public String getStateRepresentation() { + return "" + getValue(); + } } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java index 3ea678c44..b2664a30f 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java @@ -16,6 +16,9 @@ package com.android.gallery3d.filtershow.filters; +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; + public class FilterColorBorderRepresentation extends FilterRepresentation { private int mColor; private int mBorderSize; @@ -27,7 +30,12 @@ public class FilterColorBorderRepresentation extends FilterRepresentation { mBorderSize = size; mBorderRadius = radius; setFilterClass(ImageFilterParametricBorder.class); - setPriority(ImageFilter.TYPE_BORDER); + setPriority(FilterRepresentation.TYPE_BORDER); + setTextId(R.string.borders); + setEditorId(ImageOnlyEditor.ID); + setShowEditingControls(false); + setShowParameterValue(false); + setShowUtilityPanel(false); } public String toString() { @@ -74,6 +82,11 @@ public class FilterColorBorderRepresentation extends FilterRepresentation { return true; } + @Override + public int getTextId() { + return R.string.borders; + } + public int getColor() { return mColor; } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java index 5234023d0..6c831708e 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java @@ -1,5 +1,6 @@ package com.android.gallery3d.filtershow.filters; +import com.android.gallery3d.R; import com.android.gallery3d.filtershow.ui.Spline; /** @@ -10,6 +11,14 @@ public class FilterCurvesRepresentation extends FilterRepresentation { public FilterCurvesRepresentation() { super("Curves"); + setFilterClass(ImageFilterCurves.class); + setTextId(R.string.curvesRGB); + setButtonId(R.id.curvesButtonRGB); + setOverlayId(R.drawable.filtershow_button_colors_curve); + setEditorId(R.id.imageCurves); + setShowEditingControls(false); + setShowParameterValue(false); + setShowUtilityPanel(true); for (int i = 0; i < mSplines.length; i++) { mSplines[i] = new Spline(); mSplines[i].reset(); diff --git a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java index 1cb2645c7..e41f0a622 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java @@ -17,6 +17,10 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Path; +import android.util.Log; + +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.EditorDraw; import java.util.Vector; @@ -28,7 +32,7 @@ public class FilterDrawRepresentation extends FilterRepresentation { public Path mPath; public float mRadius; public int mColor; - + public int noPoints = 0; @Override public String toString() { return "stroke(" + mType + ", path(" + (mPath) + "), " + mRadius + " , " @@ -45,12 +49,18 @@ public class FilterDrawRepresentation extends FilterRepresentation { public FilterDrawRepresentation() { super("Draw"); + setFilterClass(ImageFilterDraw.class); + setPriority(FilterRepresentation.TYPE_VIGNETTE); + setTextId(R.string.imageDraw); + setButtonId(R.id.drawOnImageButton); + setEditorId(EditorDraw.ID); } @Override public String toString() { return getName() + " : strokes=" + mDrawing.size() - + ((mCurrent == null) ? " no current " : ("current=" + mCurrent.mType)); + + ((mCurrent == null) ? " no current " + : ("draw=" + mCurrent.mType + " " + mCurrent.noPoints)); } public Vector<StrokeData> getDrawing() { @@ -84,10 +94,15 @@ public class FilterDrawRepresentation extends FilterRepresentation { } if (representation.mDrawing != null) { mDrawing = (Vector<StrokeData>) representation.mDrawing.clone(); + } else { + mDrawing = null; } + } catch (CloneNotSupportedException e) { e.printStackTrace(); } + } else { + Log.v(LOGTAG, "cannot use parameters from " + a); } } @@ -97,8 +112,18 @@ public class FilterDrawRepresentation extends FilterRepresentation { return false; } if (representation instanceof FilterDrawRepresentation) { - // FIXME! - return true; + FilterDrawRepresentation fdRep = (FilterDrawRepresentation) representation; + if (fdRep.mDrawing.size() != mDrawing.size()) + return false; + if (fdRep.mCurrent == null && mCurrent.mPath == null) { + return true; + } + if (fdRep.mCurrent != null && mCurrent.mPath != null) { + if (fdRep.mCurrent.noPoints == mCurrent.noPoints) { + return true; + } + return false; + } } return false; } @@ -110,14 +135,17 @@ public class FilterDrawRepresentation extends FilterRepresentation { mCurrent.mType = type; mCurrent.mPath = new Path(); mCurrent.mPath.moveTo(x, y); + mCurrent.noPoints = 0; } public void addPoint(float x, float y) { + mCurrent.noPoints++; mCurrent.mPath.lineTo(x, y); } public void endSection(float x, float y) { mCurrent.mPath.lineTo(x, y); + mCurrent.noPoints++; mDrawing.add(mCurrent); mCurrent = null; } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java index 5aff39df4..859bf327c 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java @@ -17,7 +17,7 @@ package com.android.gallery3d.filtershow.filters; import android.graphics.Bitmap; -import com.android.gallery3d.app.Log; +import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; public class FilterFxRepresentation extends FilterRepresentation { private Bitmap mFxBitmap = null; @@ -31,6 +31,12 @@ public class FilterFxRepresentation extends FilterRepresentation { mBitmapResource = bitmapResource; mNameResource = nameResource; setFilterClass(ImageFilterFx.class); + setPriority(FilterRepresentation.TYPE_FX); + setTextId(nameResource); + setEditorId(ImageOnlyEditor.ID); + setShowEditingControls(false); + setShowParameterValue(false); + setShowUtilityPanel(false); } public String toString() { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java index 467409fb8..99c809148 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java @@ -16,18 +16,26 @@ package com.android.gallery3d.filtershow.filters; -import android.graphics.drawable.Drawable; +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.ImageOnlyEditor; public class FilterImageBorderRepresentation extends FilterRepresentation { - private Drawable mDrawable; private int mDrawableResource = 0; - public FilterImageBorderRepresentation(int drawableResource, Drawable drawable) { + public FilterImageBorderRepresentation(int drawableResource) { super("ImageBorder"); mDrawableResource = drawableResource; - mDrawable = drawable; setFilterClass(ImageFilterBorder.class); - setPriority(ImageFilter.TYPE_BORDER); + setPriority(FilterRepresentation.TYPE_BORDER); + setTextId(R.string.borders); + setEditorId(ImageOnlyEditor.ID); + setShowEditingControls(false); + setShowParameterValue(false); + setShowUtilityPanel(false); + // load the drawable at init as we are in a background thread + // (see FilterShowActivity's LoadBordersTask) + ImageFilterBorder filter = (ImageFilterBorder) FiltersManager.getManager().getFilter(getFilterClass()); + filter.getDrawable(getDrawableResource()); } public String toString() { @@ -38,7 +46,6 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { public FilterRepresentation clone() throws CloneNotSupportedException { FilterImageBorderRepresentation representation = (FilterImageBorderRepresentation) super.clone(); representation.setName(getName()); - representation.setDrawable(getDrawable()); representation.setDrawableResource(getDrawableResource()); return representation; } @@ -47,7 +54,6 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { if (a instanceof FilterImageBorderRepresentation) { FilterImageBorderRepresentation representation = (FilterImageBorderRepresentation) a; setName(representation.getName()); - setDrawable(representation.getDrawable()); setDrawableResource(representation.getDrawableResource()); } } @@ -66,16 +72,13 @@ public class FilterImageBorderRepresentation extends FilterRepresentation { return false; } - public boolean allowsMultipleInstances() { - return true; - } - - public Drawable getDrawable() { - return mDrawable; + @Override + public int getTextId() { + return R.string.borders; } - public void setDrawable(Drawable drawable) { - mDrawable = drawable; + public boolean allowsMultipleInstances() { + return true; } public int getDrawableResource() { diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java new file mode 100644 index 000000000..329f5204e --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java @@ -0,0 +1,103 @@ +/* + * 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. + */ + +package com.android.gallery3d.filtershow.filters; + +import android.graphics.RectF; +import android.util.Log; + +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.EditorRedEye; + +import java.util.Vector; + +public class FilterRedEyeRepresentation extends FilterRepresentation { + private static final String LOGTAG = "FilterRedEyeRepresentation"; + private Vector<RedEyeCandidate> mCandidates = new Vector<RedEyeCandidate>(); + + public FilterRedEyeRepresentation() { + super("RedEye"); + setFilterClass(ImageFilterRedEye.class); + setPriority(FilterRepresentation.TYPE_NORMAL); + setTextId(R.string.redeye); + setEditorId(EditorRedEye.ID); + setOverlayId(R.drawable.photoeditor_effect_redeye); + } + + @Override + public FilterRepresentation clone() throws CloneNotSupportedException { + FilterRedEyeRepresentation representation = (FilterRedEyeRepresentation) super + .clone(); + representation.mCandidates = (Vector<RedEyeCandidate>) mCandidates.clone(); + return representation; + } + + public boolean hasCandidates() { + return mCandidates != null; + } + + public Vector<RedEyeCandidate> getCandidates() { + return mCandidates; + } + + public void setCandidates(Vector<RedEyeCandidate> mCandidates) { + this.mCandidates = mCandidates; + } + + public RedEyeCandidate getCandidate(int index) { + return this.mCandidates.get(index); + } + + public void addCandidate(RedEyeCandidate c) { + this.mCandidates.add(c); + } + + public void removeCandidate(RedEyeCandidate c) { + this.mCandidates.remove(c); + } + + public void clearCandidates() { + this.mCandidates.clear(); + } + + public int getNumberOfCandidates() { + if (mCandidates == null) { + return 0; + } + return mCandidates.size(); + } + + public void addRect(RectF rect, RectF bounds) { + if (!hasCandidates()) { + setCandidates(new Vector<RedEyeCandidate>()); + } + Vector<RedEyeCandidate> intersects = new Vector<RedEyeCandidate>(); + for (int i = 0; i < getCandidates().size(); i++) { + RedEyeCandidate r = getCandidate(i); + if (r.intersect(rect)) { + intersects.add(r); + } + } + for (int i = 0; i < intersects.size(); i++) { + RedEyeCandidate r = intersects.elementAt(i); + rect.union(r.mRect); + bounds.union(r.mBounds); + removeCandidate(r); + } + addCandidate(new RedEyeCandidate(rect, bounds)); + } + +} diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index 7d9d7f923..8ac191de7 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -17,17 +17,28 @@ package com.android.gallery3d.filtershow.filters; import com.android.gallery3d.app.Log; +import com.android.gallery3d.filtershow.editors.BasicEditor; import com.android.gallery3d.filtershow.presets.ImagePreset; -import java.util.HashMap; - public class FilterRepresentation implements Cloneable { private static final String LOGTAG = "FilterRepresentation"; private String mName; - private int mPriority; - private ImagePreset mPreset; - private boolean mShowParameterValue; + private int mPriority = TYPE_NORMAL; private Class mFilterClass; + private int mTextId = 0; + private int mEditorId = BasicEditor.ID; + private int mButtonId = 0; + private int mOverlayId = 0; + private boolean mShowEditingControls = true; + private boolean mShowParameterValue = true; + private boolean mShowUtilityPanel = true; + + public static final byte TYPE_BORDER = 1; + public static final byte TYPE_FX = 2; + public static final byte TYPE_WBALANCE = 3; + public static final byte TYPE_VIGNETTE = 4; + public static final byte TYPE_NORMAL = 5; + public static final byte TYPE_TINYPLANET = 6; public FilterRepresentation(String name) { mName = name; @@ -39,6 +50,13 @@ public class FilterRepresentation implements Cloneable { representation.setName(getName()); representation.setPriority(getPriority()); representation.setFilterClass(getFilterClass()); + representation.setTextId(getTextId()); + representation.setEditorId(getEditorId()); + representation.setButtonId(getButtonId()); + representation.setOverlayId(getOverlayId()); + representation.setShowEditingControls(showEditingControls()); + representation.setShowParameterValue(showParameterValue()); + representation.setShowUtilityPanel(showUtilityPanel()); Log.v(LOGTAG, "cloning from <" + this + "> to <" + representation + ">"); return representation; } @@ -50,7 +68,13 @@ public class FilterRepresentation implements Cloneable { if (representation.mFilterClass == representation.mFilterClass && representation.mName.equalsIgnoreCase(mName) && representation.mPriority == mPriority - && representation.mShowParameterValue == mShowParameterValue) { + && representation.mTextId == mTextId + && representation.mEditorId == mEditorId + && representation.mButtonId == mButtonId + && representation.mOverlayId == mOverlayId + && representation.mShowEditingControls == mShowEditingControls + && representation.mShowParameterValue == mShowParameterValue + && representation.mShowUtilityPanel == mShowUtilityPanel) { return true; } return false; @@ -76,10 +100,6 @@ public class FilterRepresentation implements Cloneable { return mPriority; } - public void setImagePreset(ImagePreset preset) { - mPreset = preset; - } - public boolean isNil() { return false; } @@ -87,14 +107,6 @@ public class FilterRepresentation implements Cloneable { public void useParametersFrom(FilterRepresentation a) { } - public void setShowParameterValue(boolean showParameterValue) { - mShowParameterValue = showParameterValue; - } - - public boolean showParameterValue() { - return mShowParameterValue; - } - public boolean allowsMultipleInstances() { return false; } @@ -113,4 +125,64 @@ public class FilterRepresentation implements Cloneable { } return getFilterClass() == b.getFilterClass(); } + + public int getTextId() { + return mTextId; + } + + public void setTextId(int textId) { + mTextId = textId; + } + + public int getButtonId() { + return mButtonId; + } + + public void setButtonId(int buttonId) { + mButtonId = buttonId; + } + + public int getOverlayId() { + return mOverlayId; + } + + public void setOverlayId(int overlayId) { + mOverlayId = overlayId; + } + + public int getEditorId() { + return mEditorId; + } + + public void setEditorId(int editorId) { + mEditorId = editorId; + } + + public boolean showEditingControls() { + return mShowEditingControls; + } + + public void setShowEditingControls(boolean showEditingControls) { + mShowEditingControls = showEditingControls; + } + + public boolean showParameterValue() { + return mShowParameterValue; + } + + public void setShowParameterValue(boolean showParameterValue) { + mShowParameterValue = showParameterValue; + } + + public boolean showUtilityPanel() { + return mShowUtilityPanel; + } + + public void setShowUtilityPanel(boolean showUtilityPanel) { + mShowUtilityPanel = showUtilityPanel; + } + + public String getStateRepresentation() { + return ""; + } } diff --git a/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java new file mode 100644 index 000000000..7b69ce9e0 --- /dev/null +++ b/src/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java @@ -0,0 +1,65 @@ +/* + * 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. + */ + +package com.android.gallery3d.filtershow.filters; + +import com.android.gallery3d.R; +import com.android.gallery3d.filtershow.editors.EditorTinyPlanet; + +public class FilterTinyPlanetRepresentation extends FilterBasicRepresentation { + private static final String LOGTAG = "FilterTinyPlanetRepresentation"; + private float mAngle = 0; + + public FilterTinyPlanetRepresentation() { + super("TinyPlanet", 0, 50, 100); + setShowParameterValue(true); + setFilterClass(ImageFilterTinyPlanet.class); + setPriority(FilterRepresentation.TYPE_TINYPLANET); + setTextId(R.string.tinyplanet); + setButtonId(R.id.tinyplanetButton); + setEditorId(EditorTinyPlanet.ID); + } + + @Override + public FilterRepresentation clone() throws CloneNotSupportedException { + FilterTinyPlanetRepresentation representation = (FilterTinyPlanetRepresentation) super + .clone(); + representation.mAngle = mAngle; + representation.setZoom(getZoom()); + return representation; + } + + public void setAngle(float angle) { + mAngle = angle; + } + + public float getAngle() { + return mAngle; + } + + public int getZoom() { + return getValue(); + } + + public void setZoom(int zoom) { + setValue(zoom); + } + + public boolean isNil() { + // TinyPlanet always has an effect + return false; + } +} diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index fb58d1ff9..3ee55ada5 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -21,6 +21,7 @@ import android.util.Log; import com.android.gallery3d.filtershow.ImageStateAdapter; import com.android.gallery3d.filtershow.cache.ImageLoader; +import com.android.gallery3d.filtershow.filters.BaseFiltersManager; import com.android.gallery3d.filtershow.filters.FilterRepresentation; import com.android.gallery3d.filtershow.filters.FiltersManager; import com.android.gallery3d.filtershow.filters.ImageFilter; @@ -35,7 +36,10 @@ public class ImagePreset { private FilterRepresentation mBorder = null; private float mScaleFactor = 1.0f; - private boolean mIsHighQuality = false; + public static final int QUALITY_ICON = 0; + public static final int QUALITY_PREVIEW = 1; + public static final int QUALITY_FINAL = 2; + private int mQuality = QUALITY_PREVIEW; private ImageLoader mImageLoader = null; private Vector<FilterRepresentation> mFilters = new Vector<FilterRepresentation>(); @@ -72,7 +76,6 @@ public class ImagePreset { } for (int i = 0; i < source.mFilters.size(); i++) { FilterRepresentation representation = source.mFilters.elementAt(i).clone(); - representation.setImagePreset(this); addFilter(representation); } } catch (java.lang.CloneNotSupportedException e) { @@ -172,11 +175,11 @@ public class ImagePreset { return false; } for (FilterRepresentation representation : mFilters) { - if (representation.getPriority() == ImageFilter.TYPE_VIGNETTE + if (representation.getPriority() == FilterRepresentation.TYPE_VIGNETTE && !representation.isNil()) { return false; } - if (representation.getPriority() == ImageFilter.TYPE_TINYPLANET + if (representation.getPriority() == FilterRepresentation.TYPE_TINYPLANET && !representation.isNil()) { return false; } @@ -323,20 +326,20 @@ public class ImagePreset { public void addFilter(FilterRepresentation representation) { Log.v(LOGTAG, "*** Add Filter *** " + representation); - if (representation.getPriority() == ImageFilter.TYPE_BORDER) { + if (representation.getPriority() == FilterRepresentation.TYPE_BORDER) { setHistoryName(representation.getName()); setBorder(representation); - } else if (representation.getPriority() == ImageFilter.TYPE_FX) { + } else if (representation.getPriority() == FilterRepresentation.TYPE_FX) { boolean found = false; for (int i = 0; i < mFilters.size(); i++) { int type = mFilters.elementAt(i).getPriority(); if (found) { - if (type != ImageFilter.TYPE_VIGNETTE) { + if (type != FilterRepresentation.TYPE_VIGNETTE) { mFilters.remove(i); continue; } } - if (type == ImageFilter.TYPE_FX) { + if (type == FilterRepresentation.TYPE_FX) { mFilters.remove(i); mFilters.add(i, representation); setHistoryName(representation.getName()); @@ -351,7 +354,6 @@ public class ImagePreset { mFilters.add(representation); setHistoryName(representation.getName()); } - representation.setImagePreset(this); } public FilterRepresentation getRepresentation(FilterRepresentation filterRepresentation) { @@ -380,14 +382,15 @@ public class ImagePreset { public Bitmap applyGeometry(Bitmap bitmap) { // Apply any transform -- 90 rotate, flip, straighten, crop // Returns a new bitmap. - return mGeoData.apply(bitmap, mScaleFactor, mIsHighQuality); + return mGeoData.apply(bitmap, mScaleFactor, mQuality); } public Bitmap applyBorder(Bitmap bitmap) { if (mBorder != null && mDoApplyGeometry) { ImageFilter filter = FiltersManager.getManager().getFilterForRepresentation(mBorder); filter.useRepresentation(mBorder); - bitmap = filter.apply(bitmap, mScaleFactor, mIsHighQuality); + filter.setImagePreset(this); + bitmap = filter.apply(bitmap, mScaleFactor, mQuality); } return bitmap; } @@ -408,7 +411,7 @@ public class ImagePreset { } ImageFilter filter = FiltersManager.getManager().getFilterForRepresentation(representation); filter.useRepresentation(representation); - bitmap = filter.apply(bitmap, mScaleFactor, mIsHighQuality); + bitmap = filter.apply(bitmap, mScaleFactor, mQuality); } } @@ -421,7 +424,7 @@ public class ImagePreset { } imageStateAdapter.clear(); // TODO: re-enable the state panel - // imageStateAdapter.addAll(mFilters); + imageStateAdapter.addAll(mFilters); imageStateAdapter.notifyDataSetChanged(); } @@ -429,12 +432,12 @@ public class ImagePreset { return mScaleFactor; } - public boolean isHighQuality() { - return mIsHighQuality; + public int getQuality() { + return mQuality; } - public void setIsHighQuality(boolean value) { - mIsHighQuality = value; + public void setQuality(int value) { + mQuality = value; } public void setScaleFactor(float value) { |
