summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/mipmap-hdpi/ic_launcher_live_wallpaper.pngbin6163 -> 25180 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_live_wallpaper.pngbin3420 -> 23700 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_live_wallpaper.pngbin9991 -> 26807 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_live_wallpaper.pngbin17851 -> 30144 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_live_wallpaper.pngbin0 -> 34089 bytes
-rw-r--r--res/values-ast-rES/strings.xml41
-rw-r--r--res/values-br-rFR/strings.xml1
-rw-r--r--res/values-csb-rPL/strings.xml1
-rw-r--r--res/values-cy/strings.xml33
-rw-r--r--res/values-eo/strings.xml23
-rw-r--r--res/values-es-rCO/strings.xml1
-rw-r--r--res/values-fil-rPH/strings.xml (renamed from res/values-as-rIN/strings.xml)1
-rw-r--r--res/values-frp-rIT/strings.xml1
-rw-r--r--res/values-ga-rIE/strings.xml1
-rw-r--r--res/values-gd-rGB/strings.xml1
-rw-r--r--res/values-kab-rDZ/strings.xml25
-rw-r--r--res/values-ku/strings.xml39
-rw-r--r--res/values-lb/strings.xml41
-rw-r--r--res/values-oc-rFR/strings.xml1
-rw-r--r--res/values-or-rIN/strings.xml40
-rw-r--r--res/values-pl/strings.xml2
-rw-r--r--res/values-rm-rCH/strings.xml (renamed from res/values-en-rPT/strings.xml)1
-rw-r--r--res/values-sr-rCS/strings.xml (renamed from res/values-es-rMX/strings.xml)1
-rw-r--r--res/values-ug/strings.xml39
-rw-r--r--res/values-vec-rIT/strings.xml (renamed from res/values-fy-rNL/strings.xml)1
-rw-r--r--res/values-zh-rCN/strings.xml2
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java7
27 files changed, 92 insertions, 211 deletions
diff --git a/res/mipmap-hdpi/ic_launcher_live_wallpaper.png b/res/mipmap-hdpi/ic_launcher_live_wallpaper.png
index e2a6978..368e53d 100644
--- a/res/mipmap-hdpi/ic_launcher_live_wallpaper.png
+++ b/res/mipmap-hdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_live_wallpaper.png b/res/mipmap-mdpi/ic_launcher_live_wallpaper.png
index 83d98c4..575f440 100644
--- a/res/mipmap-mdpi/ic_launcher_live_wallpaper.png
+++ b/res/mipmap-mdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png
index 3f62ffb..66049f1 100644
--- a/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png
+++ b/res/mipmap-xhdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png
index b42c728..2459235 100644
--- a/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png
+++ b/res/mipmap-xxhdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_live_wallpaper.png b/res/mipmap-xxxhdpi/ic_launcher_live_wallpaper.png
new file mode 100644
index 0000000..ac4f89d
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_live_wallpaper.png
Binary files differ
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index b07fb05..2a21702 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -18,33 +18,16 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <string name="application_name">Seleutor de fondu de pantalla animáu</string>
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <string name="live_wallpaper_picker_title">Esbillar fondu de pantalla animáu</string>
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <string name="live_wallpaper_picker_label">Fondos animaos</string>
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <string name="live_wallpaper_preview_title">Vista previa de fondos animaos</string>
- <!-- List item for configuring the current wallpaper -->
- <string name="configure_wallpaper">Axustes&#8230;</string>
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <string name="wallpaper_instructions">Afitar fondu de pantalla</string>
- <!-- Warning message, no live wallpapers available. -->
- <string name="live_wallpaper_empty">Nun hai fondos animaos.</string>
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <string name="set_live_wallpaper">Afitar fondu de pantalla</string>
- <!-- Label, title and author of the live wallpaper -->
- <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> por <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">Cargando fondu de pantalla&#8230;</string>
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="application_name">Seleutor de fondos de pantalla animaos</string>
+ <string name="live_wallpaper_picker_title">Esbillar fondu de pantalla animáu</string>
+ <string name="live_wallpaper_picker_label">Fondos de pantalla animaos</string>
+ <string name="live_wallpaper_preview_title">Previsualización de fondi de pantalla animáu</string>
+ <string name="configure_wallpaper">Axustes…</string>
+ <string name="wallpaper_instructions">Afitar fondu de pantalla</string>
+ <string name="live_wallpaper_empty">Nun hai fondos de pantalla animaos.</string>
+ <string name="set_live_wallpaper">Afitar fondu de pantalla</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> por <xliff:g id="author" example="Google">%2$s</xliff:g></string>
+ <string name="live_wallpaper_loading">Cargando fondu de pantalla animáu…</string>
+ <string name="which_wallpaper_option_home_screen">Pantalla d\'aniciu</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen">Pantalles d\'aniciu y bloquéu</string>
</resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index f593186..09c632e 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
index f593186..09c632e 100644
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index f593186..2ce1cdb 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -18,23 +18,18 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <!-- List item for configuring the current wallpaper -->
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <!-- Warning message, no live wallpapers available. -->
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <!-- Label, title and author of the live wallpaper -->
- <!-- Message, tells the user the selected live wallpaper is loading. -->
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="application_name">Dewisydd Papur Wal Byw</string>
+ <string name="live_wallpaper_picker_title">Dewis papur wal byw</string>
+ <string name="live_wallpaper_picker_label">Papurau Wal Byw</string>
+ <string name="live_wallpaper_preview_title">Rhagolwg papur wal byw</string>
+ <string name="configure_wallpaper">Gosodiadau…</string>
+ <string name="wallpaper_instructions">Gosod papur wal</string>
+ <string name="live_wallpaper_empty">Dim papurau wal byw</string>
+ <string name="set_live_wallpaper">Gosod papur wal</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> gan <xliff:g id="author" example="Google">%2$s</xliff:g></string>
+ <string name="live_wallpaper_loading">Yn llwytho papur wal byw…</string>
+ <string name="which_wallpaper_option_home_screen">Sgrin gartref</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen">Sgrin gartref a sgrin cloi</string>
+ <string name="collapse_attribution_panel">Cwympo panel gwybodaeth papur wal</string>
+ <string name="expand_attribution_panel">Ehangu panel gwybodaeth papur wal</string>
</resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 2275983..a18f551 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -18,25 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <!-- List item for configuring the current wallpaper -->
- <string name="configure_wallpaper">Agordoj&#8230;</string>
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <!-- Warning message, no live wallpapers available. -->
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <!-- Label, title and author of the live wallpaper -->
- <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> de <xliff:g id="author" example="Google">%2$s</xliff:g></string>
- <!-- Message, tells the user the selected live wallpaper is loading. -->
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="configure_wallpaper">Agordoj…</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> de <xliff:g id="author" example="Google">%2$s</xliff:g></string>
</resources>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index f593186..09c632e 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-as-rIN/strings.xml b/res/values-fil-rPH/strings.xml
index f593186..09c632e 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-fil-rPH/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
index f593186..09c632e 100644
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index f593186..09c632e 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index f593186..09c632e 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-kab-rDZ/strings.xml b/res/values-kab-rDZ/strings.xml
new file mode 100644
index 0000000..66019b5
--- /dev/null
+++ b/res/values-kab-rDZ/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+* Copyright (C) 2008 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="which_wallpaper_option_home_screen">Agdil agejdan</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen">Agdil agejdan d ugdil n usekker</string>
+ <string name="collapse_attribution_panel">Fneẓ agalis n telɣut n tugna n ugilal</string>
+ <string name="expand_attribution_panel">Snefli agalis n telɣut n tugna n ugilal</string>
+</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 1774477..0123ab1 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -18,33 +18,14 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <string name="application_name">هەڵباردنی وێنەی ڕاستەوخۆ</string>
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <string name="live_wallpaper_picker_title">دەست نیشانکردنی وێنەی پشتی زیندوو</string>
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <string name="live_wallpaper_picker_label">وێنەی پشتەوەی زیندوو</string>
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <string name="live_wallpaper_preview_title">پێشبینینی وێنەی پشتی زیندوو</string>
- <!-- List item for configuring the current wallpaper -->
- <string name="configure_wallpaper">رێکخستنەکان&#8230;</string>
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <string name="wallpaper_instructions">دانانی وێنەی پشتەوە</string>
- <!-- Warning message, no live wallpapers available. -->
- <string name="live_wallpaper_empty">پشتەگەڵاڵەی ڕاستەوخۆ نیە.</string>
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <string name="set_live_wallpaper">دانانی پشتەگەڵاڵە</string>
- <!-- Label, title and author of the live wallpaper -->
- <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> لەلایەن<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">دانانی پشتەگەڵاڵەی ڕاستەخۆ...</string>
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="application_name">هەڵباردنی وێنەی ڕاستەوخۆ</string>
+ <string name="live_wallpaper_picker_title">دەست نیشانکردنی وێنەی پشتی زیندوو</string>
+ <string name="live_wallpaper_picker_label">وێنەی پشتەوەی زیندوو</string>
+ <string name="live_wallpaper_preview_title">پێشبینینی وێنەی پشتی زیندوو</string>
+ <string name="configure_wallpaper">رێکخستنەکان…</string>
+ <string name="wallpaper_instructions">دانانی وێنەی پشتەوە</string>
+ <string name="live_wallpaper_empty">پشتەگەڵاڵەی ڕاستەوخۆ نیە.</string>
+ <string name="set_live_wallpaper">دانانی پشتەگەڵاڵە</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> لەلایەن<xliff:g id="author" example="Google">%2$s</xliff:g></string>
+ <string name="live_wallpaper_loading">دانانی پشتەگەڵاڵەی ڕاستەخۆ...</string>
</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 74d04e5..6e57777 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -18,33 +18,16 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <string name="application_name">Galerie vu Live-Hannergrondbiller</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-Hannergrondbild auswielen</string>
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <string name="live_wallpaper_picker_label">Live-Hannergrondbiller</string>
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <string name="live_wallpaper_preview_title">Virschau vum Live-Hannergrondbild</string>
- <!-- List item for configuring the current wallpaper -->
- <string name="configure_wallpaper">Astellungen&#8230;</string>
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <string name="wallpaper_instructions">Hannergrondbild setzen</string>
- <!-- Warning message, no live wallpapers available. -->
- <string name="live_wallpaper_empty">Keng Live-Hannergrondbiller.</string>
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <string name="set_live_wallpaper">Hannergrondbild setzen</string>
- <!-- Label, title and author of the live wallpaper -->
- <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> vu(n) <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">Live-Hannergrondbild gëtt gelueden&#8230;</string>
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="application_name">Galerie vu Live-Hannergrondbiller</string>
+ <string name="live_wallpaper_picker_title">Live-Hannergrondbild auswielen</string>
+ <string name="live_wallpaper_picker_label">Live-Hannergrondbiller</string>
+ <string name="live_wallpaper_preview_title">Virschau vum Live-Hannergrondbild</string>
+ <string name="configure_wallpaper">Astellungen…</string>
+ <string name="wallpaper_instructions">Hannergrondbild setzen</string>
+ <string name="live_wallpaper_empty">Keng Live-Hannergrondbiller.</string>
+ <string name="set_live_wallpaper">Hannergrondbild setzen</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g> vu(n) <xliff:g id="author" example="Google">%2$s</xliff:g></string>
+ <string name="live_wallpaper_loading">Live-Hannergrondbild gëtt gelueden…</string>
+ <string name="which_wallpaper_option_home_screen">Startschierm</string>
+ <string name="which_wallpaper_option_home_screen_and_lock_screen">Startschierm a Spärschierm</string>
</resources>
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index f593186..09c632e 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
deleted file mode 100644
index f593186..0000000
--- a/res/values-or-rIN/strings.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/*
-* Copyright (C) 2008 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <!-- List item for configuring the current wallpaper -->
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <!-- Warning message, no live wallpapers available. -->
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <!-- Label, title and author of the live wallpaper -->
- <!-- Message, tells the user the selected live wallpaper is loading. -->
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0bce88d..e230235 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -28,7 +28,7 @@
<string name="live_wallpaper_empty" msgid="4278728108785853407">"Brak animowanych tapet."</string>
<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="live_wallpaper_loading" msgid="2488371303130330734">"Wczytuję animowaną tapetę…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"Ekran główny"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"Ekran główny i ekran blokady"</string>
<string name="collapse_attribution_panel" msgid="4998500891743118630">"Zwiń panel informacyjny tapety"</string>
diff --git a/res/values-en-rPT/strings.xml b/res/values-rm-rCH/strings.xml
index f593186..09c632e 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-rm-rCH/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-es-rMX/strings.xml b/res/values-sr-rCS/strings.xml
index f593186..09c632e 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-sr-rCS/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 9f82a17..0ce33e2 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -18,33 +18,14 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- General -->
- <skip></skip>
- <!-- Application name -->
- <string name="application_name">ھەرىكەتچان تام قەغەز تاللىغۇچ</string>
- <!-- Title for the screen that lets the user choose a live wallpaper to use
- for the system. -->
- <string name="live_wallpaper_picker_title">ەرىكەتچان تام قەغەز تاللاڭ</string>
- <!-- Label for the live wallpaper picker [CHAR_LIMIT=40]-->
- <string name="live_wallpaper_picker_label">ھەرىكەتچان تام قەغەزلەر</string>
- <!-- Title for the screen that lets the user preview a live wallpaper. -->
- <string name="live_wallpaper_preview_title">ھەرىكەتچان تام قەغەزنى ئالدىن كۆزەت</string>
- <!-- List item for configuring the current wallpaper -->
- <string name="configure_wallpaper">تەڭشەكلەر&#8230;</string>
- <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
- <string name="wallpaper_instructions">تام قەغەز تەڭشىكى</string>
- <!-- Warning message, no live wallpapers available. -->
- <string name="live_wallpaper_empty">ھەرىكەتچان تام قەغەز يوق.</string>
- <!-- Button label, action, sets the currently selected wallpaper. -->
- <string name="set_live_wallpaper">تام قەغەز تەڭشىكى</string>
- <!-- Label, title and author of the live wallpaper -->
- <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g>/<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">ھەرىكەتچان تام قەغەزنى يۈكلەۋاتىدۇ&#8230;</string>
- <!-- Option for setting the wallpaper only on the home screen. -->
- <!-- Option for setting the wallpaper on both the home screen and lock screen. -->
- <!-- Content description for a button letting the user collapse a visual panel showing info
- about the wallpaper being previewed. [CHAR LIMIT=none] -->
- <!-- Content description for a button letting the user expand a visual panel showing info about
- the wallpaper being previewed. [CHAR LIMIT=none] -->
+ <string name="application_name">ھەرىكەتچان تام قەغەز تاللىغۇچ</string>
+ <string name="live_wallpaper_picker_title">ەرىكەتچان تام قەغەز تاللاڭ</string>
+ <string name="live_wallpaper_picker_label">ھەرىكەتچان تام قەغەزلەر</string>
+ <string name="live_wallpaper_preview_title">ھەرىكەتچان تام قەغەزنى ئالدىن كۆزەت</string>
+ <string name="configure_wallpaper">تەڭشەكلەر…</string>
+ <string name="wallpaper_instructions">تام قەغەز تەڭشىكى</string>
+ <string name="live_wallpaper_empty">ھەرىكەتچان تام قەغەز يوق.</string>
+ <string name="set_live_wallpaper">تام قەغەز تەڭشىكى</string>
+ <string name="wallpaper_title_and_author"><xliff:g id="title" example="Galaxy">%1$s</xliff:g>/<xliff:g id="author" example="Google">%2$s</xliff:g></string>
+ <string name="live_wallpaper_loading">ھەرىكەتچان تام قەغەزنى يۈكلەۋاتىدۇ…</string>
</resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-vec-rIT/strings.xml
index f593186..09c632e 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-vec-rIT/strings.xml
@@ -19,7 +19,6 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- General -->
- <skip></skip>
<!-- Application name -->
<!-- Title for the screen that lets the user choose a live wallpaper to use
for the system. -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 27b9378..cd0b2e7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -31,6 +31,6 @@
<string name="live_wallpaper_loading" msgid="2488371303130330734">"正在加载动态壁纸…"</string>
<string name="which_wallpaper_option_home_screen" msgid="6592329803583957023">"主屏幕"</string>
<string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="6170359719231147447">"主屏幕和锁定屏幕"</string>
- <string name="collapse_attribution_panel" msgid="4998500891743118630">"折叠壁纸信息面板"</string>
+ <string name="collapse_attribution_panel" msgid="4998500891743118630">"收起壁纸信息面板"</string>
<string name="expand_attribution_panel" msgid="3151357815478885438">"展开壁纸信息面板"</string>
</resources>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index f5bfce9..3991a5c 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -253,8 +253,11 @@ public class LiveWallpaperPreview extends Activity {
}
public void setLiveWallpaper(final View v) {
- if (mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_LOCK) < 0) {
- // The lock screen does not have a wallpaper, so no need to prompt; can only set both.
+ if (mWallpaperManager.getWallpaperInfo() != null
+ && mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_LOCK) < 0) {
+ // The lock screen does not have a distinct wallpaper and the current wallpaper is a
+ // live wallpaper, so since we cannot preserve any static imagery on the lock screen,
+ // set the live wallpaper directly without giving the user a destination option.
try {
setLiveWallpaper(v.getRootView().getWindowToken());
setResult(RESULT_OK);