diff options
| -rw-r--r-- | res/values-pl/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 7 |
3 files changed, 7 insertions, 4 deletions
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-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); |