diff options
61 files changed, 785 insertions, 299 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d305737..b6947dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,29 +26,29 @@ <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" /> <uses-permission android:name="android.permission.BIND_WALLPAPER" /> - + <application android:label="@string/application_name" android:icon="@drawable/ic_launcher_live_wallpaper"> - <activity android:name="LiveWallpaperListActivity" + <activity android:name="LiveWallpaperActivity" android:icon="@drawable/ic_launcher_live_wallpaper" - android:label="@string/live_wallpaper_picker_title" - android:theme="@android:style/Theme.NoTitleBar" - android:screenOrientation="nosensor"> + android:label="@string/live_wallpaper_picker_label" + android:theme="@style/LivePickerTheme" + android:hardwareAccelerated="true"> <intent-filter> <action android:name="android.service.wallpaper.LIVE_WALLPAPER_CHOOSER" /> <action android:name="android.intent.action.SET_WALLPAPER" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <meta-data android:name="android.wallpaper.preview" + android:resource="@xml/wallpaper_picker_preview" /> </activity> <activity android:name="LiveWallpaperPreview" android:icon="@drawable/ic_launcher_live_wallpaper" android:label="@string/live_wallpaper_preview_title" - android:theme="@style/Preview" - android:screenOrientation="nosensor" /> - + android:theme="@style/Preview" /> </application> </manifest> diff --git a/res/drawable-hdpi/wallpaper_picker_preview.png b/res/drawable-hdpi/wallpaper_picker_preview.png Binary files differnew file mode 100644 index 0000000..902a26c --- /dev/null +++ b/res/drawable-hdpi/wallpaper_picker_preview.png diff --git a/res/drawable-mdpi/wallpaper_picker_preview.png b/res/drawable-mdpi/wallpaper_picker_preview.png Binary files differnew file mode 100644 index 0000000..902a26c --- /dev/null +++ b/res/drawable-mdpi/wallpaper_picker_preview.png diff --git a/res/layout-xlarge/live_wallpaper_base.xml b/res/layout-xlarge/live_wallpaper_base.xml new file mode 100644 index 0000000..3c1888c --- /dev/null +++ b/res/layout-xlarge/live_wallpaper_base.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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" + android:layout_width="wrap_content" + android:layout_height="wrap_content" />
\ No newline at end of file diff --git a/res/layout-xlarge/live_wallpaper_entry.xml b/res/layout-xlarge/live_wallpaper_entry.xml new file mode 100644 index 0000000..cecdf59 --- /dev/null +++ b/res/layout-xlarge/live_wallpaper_entry.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="8dp"> + <ImageView + android:id="@+id/thumbnail" + android:layout_width="@dimen/live_wallpaper_grid_item_width" + android:layout_height="@dimen/live_wallpaper_grid_item_height" + android:layout_gravity="center" + android:layout_weight="1" + android:scaleType="centerCrop" /> + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:layout_gravity="center" + android:gravity="bottom" + android:singleLine="true" + android:ellipsize="marquee" + + android:textColor="#FFFFFFFF" + android:textSize="14sp" + android:shadowColor="#FF000000" + android:shadowDx="0.0" + android:shadowDy="1.0" + android:shadowRadius="1.0" /> +</LinearLayout> diff --git a/res/layout-xlarge/live_wallpaper_list.xml b/res/layout-xlarge/live_wallpaper_list.xml new file mode 100644 index 0000000..49a1786 --- /dev/null +++ b/res/layout-xlarge/live_wallpaper_list.xml @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="24dp" + android:paddingBottom="24dp" + android:gravity="center"> + <GridView + android:id="@android:id/list" + android:layout_width="702dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:numColumns="3" + android:stretchMode="none" + android:columnWidth="@dimen/live_wallpaper_grid_item_width" + android:verticalSpacing="0dp" + android:horizontalSpacing="0dp" + android:drawSelectorOnTop="false" /> + <TextView + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + + android:gravity="center" + android:visibility="gone" + + android:text="@string/live_wallpaper_empty" + android:textColor="#FFFFFFFF" + android:textSize="14sp" + android:shadowColor="#FF000000" + android:shadowDx="0.0" + android:shadowDy="1.0" + android:shadowRadius="1.0" /> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/live_wallpaper_base.xml b/res/layout/live_wallpaper_base.xml new file mode 100644 index 0000000..bb4c960 --- /dev/null +++ b/res/layout/live_wallpaper_base.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <fragment class="com.android.wallpaper.livepicker.LiveWallpaperActivity$WallpaperDialog" + android:id="@+id/live_wallpaper_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</FrameLayout> diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml index cce484f..b39cefb 100644 --- a/res/layout/live_wallpaper_entry.xml +++ b/res/layout/live_wallpaper_entry.xml @@ -29,7 +29,7 @@ android:id="@+id/thumbnail" android:layout_width="@dimen/live_wallpaper_thumbnail_width" - android:layout_height="@dimen/live_wallpaper_thumbnail_width" + android:layout_height="@dimen/live_wallpaper_thumbnail_height" android:layout_gravity="center_vertical" @@ -47,7 +47,7 @@ android:orientation="vertical"> <TextView - android:id="@+id/title_author" + android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/live_wallpaper_list.xml b/res/layout/live_wallpaper_list.xml index 9ac8c66..a3c22bb 100644 --- a/res/layout/live_wallpaper_list.xml +++ b/res/layout/live_wallpaper_list.xml @@ -14,8 +14,9 @@ limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" > - +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> <ListView android:id="@android:id/list" @@ -34,5 +35,4 @@ android:text="@string/live_wallpaper_empty" android:textAppearance="?android:attr/textAppearanceMedium" /> - -</merge>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/live_wallpaper_preview.xml b/res/layout/live_wallpaper_preview.xml index d5da853..38cc2ac 100644 --- a/res/layout/live_wallpaper_preview.xml +++ b/res/layout/live_wallpaper_preview.xml @@ -23,7 +23,7 @@ android:paddingBottom="4dip"> <Button - android:layout_width="160dip" + android:layout_width="@dimen/live_wallpaper_preview_button_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" @@ -34,12 +34,11 @@ <Button android:id="@+id/configure" - android:layout_width="160dip" + android:layout_width="@dimen/live_wallpaper_preview_button_width" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/configure_wallpaper" android:onClick="configureLiveWallpaper" /> - </LinearLayout> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 2fab350..2e005c9 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"منتقي الخلفية المتحركة"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"خلفيات متحركة"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"تحديد خلفية متحركة"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"خلفيات متحركة"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"معاينة الخلفية المتحركة"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"الإعدادات…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"تعيين خلفية"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"تعيين خلفية"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> بواسطة <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"جارٍ تحميل الخلفية المتحركة..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"إلغاء"</string> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 2976a5f..dc96d2a 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Програма за избор на динамичен тапет"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Динамични тапети"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Избор на динамичен тапет"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Динамични тапети"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Визуализация на динамичните тапети"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Настройки…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Задаване на тапет"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Задаване на тапет"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> от <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Динамичният тапет се зарежда..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Отказ"</string> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 98b0cf4..45c491e 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selector d\'empaperat dinàmic"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Empaperats dinàmics"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Selecció del fons de pantalla animat"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fons de pantalla animats"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Visualització prèvia de l\'empaperat dinàmic"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Configuració…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Defineix l\'empaperat"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Defineix l\'empaperat"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> per <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"S\'està carregant l\'empaperat dinàmic..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel·la"</string> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 0230768..ad1daa7 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Živé tapety"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Vybrat živou tapetu"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Živé tapety"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Náhled živé tapety"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Nastavení…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Nastavit tapetu"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Nastavit tapetu"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> (autor: <xliff:g id="AUTHOR">%2$s</xliff:g>)"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Načítání živé tapety…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Zrušit"</string> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index b8f54a6..63cd121 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Valg af animeret baggrund"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animeret baggrund"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Vælg animeret baggrund"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Levende tapet"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Eksempel på animeret baggrund"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Indstillinger …"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Angiv tapet"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Angiv tapet"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>af <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Indlæser animeret baggrund ..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuller"</string> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 0a91caf..6761f19 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live-Hintergrund-Auswahl"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Live-Hintergründe"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Live-Hintergrund auswählen"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live-Hintergründe"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Vorschau für Live-Hintergrund"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Einstellungen…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Hintergrund festlegen"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Hintergrund festlegen"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> von <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Live-Hintergrund wird geladen…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Abbrechen"</string> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 6aa81a0..f3973c2 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Επιλογέας ζωντανής ταπετσαρίας"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Ζωντανές ταπετσαρίες"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Επιλέξτε ζωντανή ταπετσαρία"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Ζωντανές ταπετσαρίες"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Προεπισκόπηση ζωντανής ταπετσαρίας"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Ρυθμίσεις…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Ορισμός ταπετσαρίας"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Ορισμός ταπετσαρίας"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>του/της <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Φόρτωση ζωντανής ταπετσαρίας…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Ακύρωση"</string> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 1833e48..b83f22e 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Live wallpaper"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Select live wallpaper"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpaper"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live wallpaper preview"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Settings…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Set wallpaper"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Set wallpaper"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> by <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Loading live wallpaper…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel"</string> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 8b48aa4..e1ccf0a 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Seleccionador de fondo de pantalla animado"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Fondos de pantalla animados"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Seleccionar fondo de pantalla animado"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fondos de pantalla animados"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Vista previa del fondo de pantalla animado"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Configuración…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir como fondo de pantalla"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Definir como fondo de pantalla"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>por <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 958a2dd..de5cb9a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selector de fondo de pantalla animado"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Fondos de pantalla animados"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Seleccionar fondo de pantalla animado"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fondos de pantalla animados"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Vista previa de fondo de pantalla animado"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Ajustes…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Establecer fondo de pantalla"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Establecer fondo de pantalla"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Cargando fondo de pantalla animado…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index f90543c..b433f52 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Live wallpapers"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"انتخاب live wallpaper"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live Wallpapers"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"پیش نمایش Live wallpaper"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"تنظیمات..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"تنظیم تصویر زمینه"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"تنظیم تصویر زمینه"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> توسط <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"در حال بارگیری تصویر زمینه زنده..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"لغو"</string> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 7495417..fe83e83 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live-taustakuvan valitsin"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Live-taustakuvat"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Valitse live-taustakuva"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live-taustakuvat"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Live-taustakuvan esikatselu"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Asetukset…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Aseta taustakuva"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Aseta taustakuva"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, tekijä: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Ladataan live-taustakuvaa…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Peruuta"</string> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index acaa422..e7186c0 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Sélecteur de fond d\'écran animé"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Fonds d\'écran animés"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Sélectionner un fond d\'écran animé"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fonds d\'écran animés"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Aperçu du fond d\'écran animé"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Paramètres…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Sélectionner"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Sélectionner"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Chargement du fond d\'écran animé…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuler"</string> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index d846a8f..a4eef05 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Izbornik animiranih pozadinskih slika"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animirane pozadinske slike"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Odaberite animiranu pozadinsku sliku"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Pozadinske slike uživo"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pregled animirane pozadinske slike"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Postavke…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Postavi pozadinsku sliku"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Postavi pozadinsku sliku"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> od autora/ice: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Učitavanje animirane pozadinske slike…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Odustani"</string> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 15fc59f..140d5b4 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Élő háttérkép választó"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Élő háttérképek"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Élő háttérkép kiválasztása"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Élő háttérképek"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Élő háttérkép előnézete"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Beállítások…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Háttérkép beállítása"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Háttérkép beállítása"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>; készítette: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Élő háttérkép betöltése..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Mégse"</string> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index c291767..f479812 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Pemilih Wallpaper Animasi"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Wallpaper animasi"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Pilih wallpaper animasi"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Wallpaper Animasi"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pratinjau wallpaper animasi"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Setelan…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Setel wallpaper"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Setel wallpaper"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> oleh <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Memuat wallpaper animasi…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Batal"</string> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 6eca33a..2618b77 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selettore sfondo animato"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Sfondi animati"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Seleziona sfondo animato"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Sfondi animati"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Anteprima sfondo animato"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Impostazioni…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Imposta sfondo"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Imposta sfondo"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> di <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Caricamento sfondo animato…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Annulla"</string> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index f2287a2..9c468cb 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"בוחר טפטים מונפשים"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"טפטים מונפשים"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"בחר טפט מונפש"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"טפטים מונפשים"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"תצוגה מקדימה של טפט מונפש"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"הגדרות…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"הגדר טפט"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"הגדר טפט"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> מאת <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"טוען טפט מונפש…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"ביטול"</string> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 3a09267..4ea95d5 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"ライブ壁紙"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"ライブ壁紙の選択"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"ライブ壁紙"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"ライブ壁紙のプレビュー"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"設定..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"壁紙に設定"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"壁紙を設定"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>（作成者: <xliff:g id="AUTHOR">%2$s</xliff:g>）"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"ライブ壁紙を読み込み中…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"キャンセル"</string> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 8da0f73..cdcb81a 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"라이브 배경화면 선택기"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"라이브 배경화면"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"라이브 배경화면 선택"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"라이브 배경화면"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"라이브 배경화면 미리보기"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"설정…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"배경화면 설정"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"배경화면 설정"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> 개발자: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"라이브 배경화면 로드 중..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"취소"</string> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 958f7aa..6835bc9 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Judančių darbalaukio fonų parinkimo programa"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Judantys darbalaukio fonai"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Pasirinkti judantį darbalaukio foną"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Judantys darbalaukio fonai"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Judančio darbalaukio fono peržiūra"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Nustatymai…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Nustatyti darbalaukio foną"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Nustatyti darbalaukio foną"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> autorius <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Įkeliamas judantis darbalaukio fonas..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Atšaukti"</string> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index c9fee21..13f29ab 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Mainīgo fona tapešu atlasītājs"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Mainīgās tapetes"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Reāllaika tapetes atlasīšana"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Mainīgas fona tapetes"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Mainīgās tapetes priekšskatījums"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Iestatījumi…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Iestatīt tapeti"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Iestatīt tapeti"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, autors: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Notiek mainīgās tapetes ielāde..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Atcelt"</string> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 04a812e..a58885e 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Bakgrunnsvelger"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animerte bakgrunner"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Velg animert bakgrunnsbilde"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animerte bakgrunner"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Forhåndsvisning av animert bakgrunn"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Innstillinger"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Velg bakgrunnsbilde"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Velg bakgrunnsbilde"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> av <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Laster inn animert bakgrunn ..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Avbryt"</string> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 71e9155..b9066b6 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Interactieve achtergrondkiezer"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Interactieve achtergronden"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Live achtergrond selecteren"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Live achtergronden"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Voorbeeld van interactieve achtergrond"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Instellingen…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Achtergrond instellen"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Achtergrond instellen"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> door <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Interactieve achtergrond laden…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Annuleren"</string> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 32d8bca..3597fa6 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Animowane tapety"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animowane tapety"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Wybierz animowaną tapetę"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animowane tapety"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Podgląd animowanej tapety"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Ustawienia…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Ustaw tapetę"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Ustaw tapetę"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, autor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Wczytywanie animowanej tapety…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Anuluj"</string> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index e66cb95..63d0c5b 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Imagens de fundo activas"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Seleccionar imagem de fundo dinâmica"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Imagens de fundo activas"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Pré-visualização da imagem de fundo activa"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Definições…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir imagem de fundo"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Definir imagem de fundo"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"A carregar a imagem de fundo activa…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 554a971..028a415 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selecionador de plano de fundo animado"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Papéis de parede animados"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Selecionar Plano de fundo interativo"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Papéis de parede on-line"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Visualização do plano de fundo animado"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Configurações…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir plano de fundo"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Definir plano de fundo"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> por <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Carregando plano de fundo animado..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Cancelar"</string> </resources> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 4d853d1..6f0b534 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -20,7 +20,9 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selectur da funds davos animads"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Funds davos animads"</string> + <!-- outdated translation 6161053357728149149 --> <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Funds davos animads"</string> + <!-- no translation found for live_wallpaper_picker_label (3218000114890071946) --> + <skip /> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Prevista dal fund davos animà"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Parameters…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Definir in fund davos"</string> @@ -28,4 +30,6 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Definir il maletg dal fund davos"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> da(d) <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Il fund davos animà vegn chargià…"</string> + <!-- no translation found for wallpaper_cancel (7340240618834119228) --> + <skip /> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c578cb1..18c3416 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Selector de imagine de fundal live"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Imagini de fundal live"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Selectaţi o imagine de fundal live"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Imagini de fundal live"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Previzualizare a imaginii de fundal live"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Se setează..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Setaţi imaginea de fundal"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Setaţi imaginea de fundal"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> de <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Se încarcă imaginea de fundal live..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Anulaţi"</string> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 9ac07ae..469e210 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Каталог живых обоев"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Живые обои"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Выберите Живые обои"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Живые обои"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Предпросмотр живых обоев"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Настройки…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Установить обои"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Установить фоновый рисунок"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>, автор: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Загрузка живых обоев…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Отмена"</string> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index a32abef..6b583a0 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Živé tapety"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Vybrať živú tapetu"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Živé tapety"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Ukážka živej tapety"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Nastavenia…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Nastaviť tapetu"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Nastaviť tapetu"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> Autor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Prebieha načítanie živej tapety..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Zrušiť"</string> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index c3c3b0d..1b7e1a9 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Animirane slike za ozadje Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animirane slike za ozadje"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Izberite animirano ozadje"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animirane slike za ozadje"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Predogled animiranih slik za ozadje"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Nastavitve ..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Nastavi sliko za ozadje"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Nastavi sliko za ozadje"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>Avtor: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Nalaganje animiranih slik za ozadje ..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Prekliči"</string> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 26adab4..a5ce444 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Бирач анимираних позадина"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Анимиране позадине"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Изаберите анимирану позадину"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анимиране позадине"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Преглед анимираних позадина"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Подешавања…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Подеси позадину"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Подеси позадину"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> од аутора: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Учитавање анимиране позадине…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Откажи"</string> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index f7c72a4..f73dea3 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Bakgrundsväljare"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Levande bakgrundsbilder"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Välj levande bakgrundsbild"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Levande bakgrundsbilder"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Förhandsgranskning av levande bakgrundsbilder"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Inställningar…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Ange bakgrund"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Ange bakgrund"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> av <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Läser in levande bakgrundsbild…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Avbryt"</string> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 90867cf..5d14dd3 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"โปรแกรมสุ่มเลือกวอลเปเปอร์ภาพเคลื่อนไหว"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"วอลเปเปอร์ภาพเคลื่อนไหว"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"เลือกวอลเปเปอร์ภาพเคลื่อนไหว"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"วอลเปเปอร์ภาพเคลื่อนไหว"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"หน้าตัวอย่างวอลเปเปอร์ภาพเคลื่อนไหว"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"การตั้งค่า…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"ตั้งค่าวอลเปเปอร์"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"ตั้งค่าวอลเปเปอร์"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> โดย <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"กำลังโหลดวอลเปเปอร์ภาพเคลื่อนไหว…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"ยกเลิก"</string> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 8ba1590..1676de3 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live na Tagapili ng Wallpaper"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Mga live na wallpaper"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Pumili ng live na wallpaper"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Mga Live na Wallpaper"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Preview ng live na wallpaper"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Mga Setting…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Itakda ang wallpaper"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Itakda ang wallpaper"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> ni <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Naglo-load ng live wallpaper..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Kanselahin"</string> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index ebb0d8d..a2e0ad1 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Animasyonlu Duvar Kağıdı Seçicisi"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Animasyonlu duvar kağıtları"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Animasyonlu duvar kağıdını seçin"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Animasyonlu Duvar Kağıtları"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Animasyonlu duvar kağıdı önizlemesi"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Ayarlar…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Duvar kağıdını ayarla"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Duvar kağıdını ayarla"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> Oluşturan: <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Animasyonlu duvar kağıdı yükleniyor…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"İptal"</string> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8f953ac..f270e9c 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Інстр. виб. анім. фон. мал."</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Анімов. фонов. мал."</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Вибрати анімований фоновий малюнок"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Анімовані фонові малюнки"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Перегл. анімов. фон. мал."</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Налаштув-ня"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Устан. фон. мал."</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Устан. фон. мал."</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> автор <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Завантаж. анім. фон. мал..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Скасувати"</string> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index b9146b5..ef9c297 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Trình chọn Hình nền Động"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"Hình nền động"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"Chọn hình nền động"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Hình nền động"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"Xem trước hình nền động"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"Cài đặt…"</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"Đặt hình nền"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"Đặt hình nền"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> bởi <xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"Đang tải hình nền động..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"Hủy"</string> </resources> diff --git a/res/values-xlarge/dimensions.xml b/res/values-xlarge/dimensions.xml new file mode 100644 index 0000000..b60f099 --- /dev/null +++ b/res/values-xlarge/dimensions.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* copyright (c) 2010 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> + <dimen name="live_wallpaper_grid_item_width">224dip</dimen> + <dimen name="live_wallpaper_grid_item_height">192dip</dimen> + <dimen name="live_wallpaper_preview_button_width">200dip</dimen> +</resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml new file mode 100644 index 0000000..5338119 --- /dev/null +++ b/res/values-xlarge/styles.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +* Copyright (C) 2010 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> + <style name="LivePickerTheme" parent="android:Theme.Holo.Dialog.NoFrame" /> +</resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e783b4e..5eecf75 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"动态壁纸"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"选择动态壁纸"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"动态壁纸"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"动态壁纸预览"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"设置..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"设置壁纸"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"设置壁纸"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>提供者：<xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"正在载入动态壁纸…"</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"取消"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index a6c6717..1bdf319 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -20,7 +20,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="application_name" msgid="4119979710394894209">"動態桌布挑選器"</string> - <string name="live_wallpaper_picker_title" msgid="6161053357728149149">"動態桌布"</string> + <string name="live_wallpaper_picker_title" msgid="4811278937634144675">"選取動態桌布"</string> + <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"動態桌布"</string> <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"動態桌布預覽"</string> <string name="configure_wallpaper" msgid="7396598925806288258">"設定..."</string> <string name="wallpaper_instructions" msgid="4215640646180727542">"設定桌布"</string> @@ -28,4 +29,5 @@ <string name="set_live_wallpaper" msgid="2381437614949033266">"設定桌布"</string> <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g> 製作者：<xliff:g id="AUTHOR">%2$s</xliff:g>"</string> <string name="live_wallpaper_loading" msgid="2488371303130330734">"正在載入動態桌布..."</string> + <string name="wallpaper_cancel" msgid="7340240618834119228">"取消"</string> </resources> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index d0ee3a6..89074de 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -22,4 +22,6 @@ <dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen> <dimen name="live_wallpaper_thumbnail_width">75dip</dimen> <dimen name="live_wallpaper_thumbnail_height">75dip</dimen> + <dimen name="dialog_content_inset">0dip</dimen> + <dimen name="live_wallpaper_preview_button_width">160dip</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index c070c61..7af69c7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -24,7 +24,9 @@ <string name="application_name">Live Wallpaper Picker</string> <!-- Title for the screen that lets the user choose a live wallpaper to use for the system. --> - <string name="live_wallpaper_picker_title">Live wallpapers</string> + <string name="live_wallpaper_picker_title">Select live wallpaper</string> + <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]--> + <string name="live_wallpaper_picker_label">Live Wallpapers</string> <!-- Title for the screen that lets the user preview a live wallpaper. --> <string name="live_wallpaper_preview_title">Live wallpaper preview</string> <!-- List item for configuring the current wallpaper --> @@ -39,5 +41,7 @@ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> by <xliff:g id="author" example="Google">%2$s</xliff:g></string> <!-- Message, tells the user the selected live wallpaper is loading. --> <string name="live_wallpaper_loading">Loading live wallpaper…</string> + <!-- Button label, action, cancels the wallpaper picker dialog [CHAR_LIMIT=40]--> + <string name="wallpaper_cancel">Cancel</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index a55fbdb..8684f16 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,9 +28,14 @@ <item name="android:gravity">left</item> </style> - <style name="Preview" parent="@android:style/Theme.NoTitleBar"> + <style name="Preview" parent="android:Theme.Holo"> + <item name="android:windowNoTitle">true</item> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:colorBackgroundCacheHint">@null</item> <item name="android:windowAnimationStyle">@android:style/Animation.Activity</item> </style> + + <style name="LivePickerTheme" parent="android:style/Theme.Holo"> + <item name="android:windowNoTitle">true</item> + </style> </resources> diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml new file mode 100644 index 0000000..d52e0e0 --- /dev/null +++ b/res/xml/wallpaper_picker_preview.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<wallpaper-preview + xmlns:android="http://schemas.android.com/apk/res/android" + android:staticWallpaperPreview="@drawable/wallpaper_picker_preview"> +</wallpaper-preview>
\ No newline at end of file diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java new file mode 100644 index 0000000..d8de4e1 --- /dev/null +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperActivity.java @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2009 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.wallpaper.livepicker; + +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.app.Fragment; +import android.app.WallpaperInfo; +import android.os.Bundle; +import android.content.DialogInterface; +import android.content.Intent; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.BaseAdapter; + +public class LiveWallpaperActivity extends Activity { + private static final String LOG_TAG = "LiveWallpapersPicker"; + private static final int REQUEST_PREVIEW = 100; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.live_wallpaper_base); + + Fragment fragmentView = getFragmentManager().findFragmentById(R.id.live_wallpaper_fragment); + if (fragmentView == null) { + /* When the screen is XLarge, the fragment is not included in the layout, so show it + * as a dialog + */ + DialogFragment fragment = WallpaperDialog.newInstance(); + fragment.show(getFragmentManager(), "dialog"); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + if (requestCode == REQUEST_PREVIEW) { + if (resultCode == RESULT_OK) finish(); + } + } + + public static class WallpaperDialog extends DialogFragment implements + AdapterView.OnItemClickListener{ + private static final String EMBEDDED_KEY = "com.android.wallpaper.livepicker." + + "LiveWallpaperActivity$WallpaperDialog.EMBEDDED_KEY"; + private LiveWallpaperListAdapter mAdapter; + private boolean mEmbedded; + + public static WallpaperDialog newInstance() { + WallpaperDialog dialog = new WallpaperDialog(); + dialog.setCancelable(true); + return dialog; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (savedInstanceState != null && savedInstanceState.containsKey(EMBEDDED_KEY)) { + mEmbedded = savedInstanceState.getBoolean(EMBEDDED_KEY); + } else { + mEmbedded = isInLayout(); + } + } + + @Override + public void onSaveInstanceState(Bundle outState) { + outState.putBoolean(EMBEDDED_KEY, mEmbedded); + } + + @Override + public void onDismiss(DialogInterface dialog) { + /* On orientation changes, the dialog is effectively "dismissed" so this is called + * when the activity is no longer associated with this dying dialog fragment. We + * should just safely ignore this case by checking if getActivity() returns null + */ + Activity activity = getActivity(); + if (activity != null) { + activity.finish(); + } + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final int contentInset = getResources().getDimensionPixelSize( + R.dimen.dialog_content_inset); + View view = generateView(getActivity().getLayoutInflater(), null); + + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setNegativeButton(R.string.wallpaper_cancel, null); + builder.setTitle(R.string.live_wallpaper_picker_title); + builder.setView(view, contentInset, contentInset, contentInset, contentInset); + return builder.create(); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + /* If this fragment is embedded in the layout of this activity, then we should + * generate a view to display. Otherwise, a dialog will be created in + * onCreateDialog() + */ + if (mEmbedded) { + return generateView(inflater, container); + } + return null; + } + + @SuppressWarnings("unchecked") + private View generateView(LayoutInflater inflater, ViewGroup container) { + View layout = inflater.inflate(R.layout.live_wallpaper_list, container, false); + + mAdapter = new LiveWallpaperListAdapter(getActivity()); + AdapterView<BaseAdapter> adapterView = + (AdapterView<BaseAdapter>) layout.findViewById(android.R.id.list); + adapterView.setAdapter(mAdapter); + adapterView.setOnItemClickListener(this); + adapterView.setEmptyView(layout.findViewById(android.R.id.empty)); + return layout; + } + + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + LiveWallpaperListAdapter.LiveWallpaperInfo wallpaperInfo = + (LiveWallpaperListAdapter.LiveWallpaperInfo) mAdapter.getItem(position); + final Intent intent = wallpaperInfo.intent; + final WallpaperInfo info = wallpaperInfo.info; + LiveWallpaperPreview.showPreview(getActivity(), REQUEST_PREVIEW, intent, info); + } + } +} diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java deleted file mode 100644 index 8b0ad89..0000000 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (C) 2009 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.wallpaper.livepicker; - -import android.app.ListActivity; -import android.app.WallpaperInfo; -import android.os.Bundle; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.content.pm.ComponentInfo; -import android.content.Intent; -import android.content.res.Resources; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.Paint; -import android.graphics.Canvas; -import android.graphics.Bitmap; -import android.util.Log; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.view.LayoutInflater; -import android.service.wallpaper.WallpaperService; -import android.widget.BaseAdapter; -import android.widget.TextView; -import android.widget.ImageView; -import android.widget.AdapterView; -import android.text.Html; - -import java.util.ArrayList; -import java.util.List; -import java.util.Collections; -import java.util.Comparator; -import java.io.IOException; -import java.text.Collator; - -import org.xmlpull.v1.XmlPullParserException; - -public class LiveWallpaperListActivity extends ListActivity implements AdapterView.OnItemClickListener { - private static final String LOG_TAG = "LiveWallpapersPicker"; - - private static final int REQUEST_PREVIEW = 100; - - private PackageManager mPackageManager; - - private ArrayList<Drawable> mThumbnails; - private ArrayList<WallpaperInfo> mWallpaperInfos; - private ArrayList<Intent> mWallpaperIntents; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.live_wallpaper_list); - - mPackageManager = getPackageManager(); - - findLiveWallpapers(); - - setListAdapter(new LiveWallpapersAdapter()); - getListView().setOnItemClickListener(this); - } - - // TODO: THIS SHOULD HAPPEN IN AN ASYNCTASK - private void findLiveWallpapers() { - List<ResolveInfo> list = mPackageManager.queryIntentServices( - new Intent(WallpaperService.SERVICE_INTERFACE), - PackageManager.GET_META_DATA); - - int listSize = list.size(); - - mThumbnails = new ArrayList<Drawable>(listSize); - mWallpaperIntents = new ArrayList<Intent>(listSize); - mWallpaperInfos = new ArrayList<WallpaperInfo>(listSize); - - Resources res = getResources(); - Drawable galleryIcon = res.getDrawable(R.drawable.livewallpaper_placeholder); - - Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); - paint.setTextAlign(Paint.Align.CENTER); - - Canvas canvas = new Canvas(); - - Collections.sort(list, new Comparator<ResolveInfo>() { - final Collator mCollator; - - { - mCollator = Collator.getInstance(); - } - - public int compare(ResolveInfo info1, ResolveInfo info2) { - return mCollator.compare(info1.loadLabel(mPackageManager), - info2.loadLabel(mPackageManager)); - } - }); - - for (int i = 0; i < listSize; i++) { - ResolveInfo resolveInfo = list.get(i); - ComponentInfo ci = resolveInfo.serviceInfo; - WallpaperInfo info; - try { - info = new WallpaperInfo(this, resolveInfo); - } catch (XmlPullParserException e) { - Log.w(LOG_TAG, "Skipping wallpaper " + ci, e); - continue; - } catch (IOException e) { - Log.w(LOG_TAG, "Skipping wallpaper " + ci, e); - continue; - } - - String packageName = info.getPackageName(); - String className = info.getServiceName(); - - Intent intent = new Intent(WallpaperService.SERVICE_INTERFACE); - intent.setClassName(packageName, className); - - mWallpaperIntents.add(intent); - mWallpaperInfos.add(info); - - Drawable thumb = info.loadThumbnail(mPackageManager); - if (thumb == null) { - int thumbWidth = res.getDimensionPixelSize(R.dimen.live_wallpaper_thumbnail_width); - int thumbHeight = res.getDimensionPixelSize(R.dimen.live_wallpaper_thumbnail_height); - - Bitmap thumbnail = Bitmap.createBitmap(thumbWidth, thumbHeight, - Bitmap.Config.ARGB_8888); - - paint.setColor(res.getColor(R.color.live_wallpaper_thumbnail_background)); - canvas.setBitmap(thumbnail); - canvas.drawPaint(paint); - - galleryIcon.setBounds(0, 0, thumbWidth, thumbHeight); - ((BitmapDrawable) galleryIcon).setGravity(Gravity.CENTER); - galleryIcon.draw(canvas); - - String title = info.loadLabel(mPackageManager).toString(); - - paint.setColor(res.getColor(R.color.live_wallpaper_thumbnail_text_color)); - paint.setTextSize( - res.getDimensionPixelSize(R.dimen.live_wallpaper_thumbnail_text_size)); - - canvas.drawText(title, (int) (thumbWidth * 0.5), - thumbHeight - res.getDimensionPixelSize( - R.dimen.live_wallpaper_thumbnail_text_offset), paint); - - thumb = new BitmapDrawable(res, thumbnail); - } - - thumb.setDither(true); - mThumbnails.add(thumb); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == REQUEST_PREVIEW) { - if (resultCode == RESULT_OK) finish(); - } - } - - public void onItemClick(AdapterView<?> parent, View view, int position, long id) { - final Intent intent = mWallpaperIntents.get(position); - final WallpaperInfo info = mWallpaperInfos.get(position); - LiveWallpaperPreview.showPreview(this, REQUEST_PREVIEW, intent, info); - } - - static class ViewHolder { - TextView titleAuthor; - TextView description; - ImageView thumbnail; - } - - private class LiveWallpapersAdapter extends BaseAdapter { - private final LayoutInflater mInflater; - - LiveWallpapersAdapter() { - mInflater = LayoutInflater.from(LiveWallpaperListActivity.this); - } - - public int getCount() { - return mWallpaperInfos.size(); - } - - public Object getItem(int position) { - return mWallpaperInfos.get(position); - } - - public long getItemId(int position) { - return position; - } - - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder holder; - if (convertView == null) { - convertView = mInflater.inflate(R.layout.live_wallpaper_entry, parent, false); - - holder = new ViewHolder(); - holder.titleAuthor = (TextView) convertView.findViewById(R.id.title_author); - holder.description = (TextView) convertView.findViewById(R.id.description); - holder.thumbnail = (ImageView) convertView.findViewById(R.id.thumbnail); - convertView.setTag(holder); - } else { - holder = (ViewHolder) convertView.getTag(); - } - - WallpaperInfo info = mWallpaperInfos.get(position); - holder.thumbnail.setImageDrawable(mThumbnails.get(position)); - // author not currently used - holder.titleAuthor.setText(info.loadLabel(mPackageManager)); - try { - holder.description.setVisibility(View.VISIBLE); - holder.description.setText(Html.fromHtml( - info.loadDescription(mPackageManager).toString())); - } catch (Resources.NotFoundException e) { - holder.description.setVisibility(View.GONE); - } - - return convertView; - } - } -} diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java new file mode 100644 index 0000000..b10de8b --- /dev/null +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java @@ -0,0 +1,255 @@ +/* + * Copyright (C) 2010 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.wallpaper.livepicker; + +import android.app.WallpaperInfo; +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.os.AsyncTask; +import android.service.wallpaper.WallpaperService; +import android.text.Html; +import android.util.Log; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.ListAdapter; +import android.widget.TextView; + +import org.xmlpull.v1.XmlPullParserException; + +import java.io.IOException; +import java.text.Collator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter { + private static final String LOG_TAG = "LiveWallpaperListAdapter"; + + private final LayoutInflater mInflater; + private final PackageManager mPackageManager; + + private List<LiveWallpaperInfo> mWallpapers; + + @SuppressWarnings("unchecked") + public LiveWallpaperListAdapter(Context context) { + mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + mPackageManager = context.getPackageManager(); + + List<ResolveInfo> list = mPackageManager.queryIntentServices( + new Intent(WallpaperService.SERVICE_INTERFACE), + PackageManager.GET_META_DATA); + + mWallpapers = generatePlaceholderViews(list.size()); + + new LiveWallpaperEnumerator(context).execute(list); + } + + private List<LiveWallpaperInfo> generatePlaceholderViews(int amount) { + ArrayList<LiveWallpaperInfo> list = new ArrayList<LiveWallpaperInfo>(amount); + for (int i = 0; i < amount; i++) { + LiveWallpaperInfo info = new LiveWallpaperInfo(); + list.add(info); + } + return list; + } + + public int getCount() { + if (mWallpapers == null) { + return 0; + } + return mWallpapers.size(); + } + + public Object getItem(int position) { + return mWallpapers.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder holder; + if (convertView == null) { + convertView = mInflater.inflate(R.layout.live_wallpaper_entry, parent, false); + + holder = new ViewHolder(); + holder.title = (TextView) convertView.findViewById(R.id.title); + holder.description = (TextView) convertView.findViewById(R.id.description); + holder.thumbnail = (ImageView) convertView.findViewById(R.id.thumbnail); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + LiveWallpaperInfo wallpaperInfo = mWallpapers.get(position); + if (holder.thumbnail != null) { + holder.thumbnail.setImageDrawable(wallpaperInfo.thumbnail); + } + + if (holder.title != null && wallpaperInfo.info != null) { + holder.title.setText(wallpaperInfo.info.loadLabel(mPackageManager)); + if (holder.thumbnail == null) { + holder.title.setCompoundDrawablesWithIntrinsicBounds(null, wallpaperInfo.thumbnail, + null, null); + } + } + + if (holder.description != null && wallpaperInfo.info != null) { + try { + holder.description.setVisibility(View.VISIBLE); + holder.description.setText(Html.fromHtml( + wallpaperInfo.info.loadDescription(mPackageManager).toString())); + } catch (Resources.NotFoundException e) { + holder.description.setVisibility(View.GONE); + } + } + + return convertView; + } + + public class LiveWallpaperInfo { + public Drawable thumbnail; + public WallpaperInfo info; + public Intent intent; + } + + private class ViewHolder { + TextView title; + TextView description; + ImageView thumbnail; + } + + private class LiveWallpaperEnumerator extends + AsyncTask<List<ResolveInfo>, LiveWallpaperInfo, Void> { + private Context mContext; + private int mWallpaperPosition; + + public LiveWallpaperEnumerator(Context context) { + super(); + mContext = context; + mWallpaperPosition = 0; + } + + @Override + protected Void doInBackground(List<ResolveInfo>... params) { + final PackageManager packageManager = mContext.getPackageManager(); + + List<ResolveInfo> list = params[0]; + + final Resources res = mContext.getResources(); + BitmapDrawable galleryIcon = (BitmapDrawable) res.getDrawable( + R.drawable.livewallpaper_placeholder); + Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG); + paint.setTextAlign(Paint.Align.CENTER); + Canvas canvas = new Canvas(); + + Collections.sort(list, new Comparator<ResolveInfo>() { + final Collator mCollator; + + { + mCollator = Collator.getInstance(); + } + + public int compare(ResolveInfo info1, ResolveInfo info2) { + return mCollator.compare(info1.loadLabel(packageManager), + info2.loadLabel(packageManager)); + } + }); + + for (ResolveInfo resolveInfo : list) { + WallpaperInfo info = null; + try { + info = new WallpaperInfo(mContext, resolveInfo); + } catch (XmlPullParserException e) { + Log.w(LOG_TAG, "Skipping wallpaper " + resolveInfo.serviceInfo, e); + continue; + } catch (IOException e) { + Log.w(LOG_TAG, "Skipping wallpaper " + resolveInfo.serviceInfo, e); + continue; + } + + LiveWallpaperInfo wallpaper = new LiveWallpaperInfo(); + wallpaper.intent = new Intent(WallpaperService.SERVICE_INTERFACE); + wallpaper.intent.setClassName(info.getPackageName(), info.getServiceName()); + wallpaper.info = info; + + Drawable thumb = info.loadThumbnail(packageManager); + if (thumb == null) { + int thumbWidth = res.getDimensionPixelSize( + R.dimen.live_wallpaper_thumbnail_width); + int thumbHeight = res.getDimensionPixelSize( + R.dimen.live_wallpaper_thumbnail_height); + + Bitmap thumbnail = Bitmap.createBitmap(thumbWidth, thumbHeight, + Bitmap.Config.ARGB_8888); + + paint.setColor(res.getColor(R.color.live_wallpaper_thumbnail_background)); + canvas.setBitmap(thumbnail); + canvas.drawPaint(paint); + + galleryIcon.setBounds(0, 0, thumbWidth, thumbHeight); + galleryIcon.setGravity(Gravity.CENTER); + galleryIcon.draw(canvas); + + String title = info.loadLabel(packageManager).toString(); + + paint.setColor(res.getColor(R.color.live_wallpaper_thumbnail_text_color)); + paint.setTextSize( + res.getDimensionPixelSize(R.dimen.live_wallpaper_thumbnail_text_size)); + + canvas.drawText(title, (int) (thumbWidth * 0.5), + thumbHeight - res.getDimensionPixelSize( + R.dimen.live_wallpaper_thumbnail_text_offset), paint); + + thumb = new BitmapDrawable(res, thumbnail); + } + wallpaper.thumbnail = thumb; + publishProgress(wallpaper); + } + + return null; + } + + @Override + protected void onProgressUpdate(LiveWallpaperInfo...infos) { + for (LiveWallpaperInfo info : infos) { + info.thumbnail.setDither(true); + if (mWallpaperPosition < mWallpapers.size()) { + mWallpapers.set(mWallpaperPosition, info); + } else { + mWallpapers.add(info); + } + mWallpaperPosition++; + LiveWallpaperListAdapter.this.notifyDataSetChanged(); + } + } + } +} diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java index a8c91be..54b6382 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java @@ -196,10 +196,28 @@ public class LiveWallpaperPreview extends Activity { if (ev.getAction() == MotionEvent.ACTION_DOWN) { onUserInteraction(); } - if (getWindow().superDispatchTouchEvent(ev)) { - return true; + boolean handled = getWindow().superDispatchTouchEvent(ev); + if (!handled) { + handled = onTouchEvent(ev); } - return onTouchEvent(ev); + + if (!handled && mWallpaperConnection != null && mWallpaperConnection.mEngine != null) { + int action = ev.getActionMasked(); + try { + if (action == MotionEvent.ACTION_UP) { + mWallpaperConnection.mEngine.dispatchWallpaperCommand( + WallpaperManager.COMMAND_TAP, + (int) ev.getX(), (int) ev.getY(), 0, null); + } else if (action == MotionEvent.ACTION_POINTER_UP) { + int pointerIndex = ev.getActionIndex(); + mWallpaperConnection.mEngine.dispatchWallpaperCommand( + WallpaperManager.COMMAND_SECONDARY_TAP, + (int) ev.getX(pointerIndex), (int) ev.getY(pointerIndex), 0, null); + } + } catch (RemoteException e) { + } + } + return handled; } class WallpaperConnection extends IWallpaperConnection.Stub implements ServiceConnection { |
