summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-11-18 22:30:24 -0800
committerSteve Kondik <shade@chemlab.org>2012-11-18 22:30:24 -0800
commit0d0460a4097c29ce35d6e40131cc289348f1853f (patch)
tree08b6fe415dbf539c19edfd28a974e53c261942dc
parent19d496aa4a2102e4d2e91c09b12cf2c0fd4c2047 (diff)
parentf14b1d2e17ee862b84c9acb88f299984c6e969d9 (diff)
downloadandroid_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.zip
android_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.tar.gz
android_packages_wallpapers_LivePicker-0d0460a4097c29ce35d6e40131cc289348f1853f.tar.bz2
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/wallpapers/LivePicker into HEADcm-10.1-M1
-rw-r--r--Android.mk11
-rw-r--r--res/values-ca/strings.xml4
-rw-r--r--res/values-da/strings.xml4
-rw-r--r--res/values-es/strings.xml2
-rw-r--r--res/values-fa/strings.xml2
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java4
6 files changed, 14 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk
index d532303..75b3388 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,20 +21,17 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android.software.live_wallpaper.xml
-#LOCAL_MODULE_TAGS := user
-
LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_TAGS := optional
+
# This will install the file in /system/etc/permissions
#
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
LOCAL_SRC_FILES := $(LOCAL_MODULE)
-# XXX the intention is that this file be copied automatically when
-# LiveWallpaperPicker is being bundled with a system. Unfortunately
-# it isn't working correctly (it always gets copied).
-#include $(BUILD_PREBUILT)
+include $(BUILD_PREBUILT)
########################
include $(CLEAR_VARS)
@@ -42,7 +39,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-#LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
+LOCAL_REQUIRED_MODULES := android.software.live_wallpaper.xml
LOCAL_PACKAGE_NAME := LiveWallpapersPicker
LOCAL_CERTIFICATE := platform
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ea031ca..529f380 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -22,12 +22,12 @@
<string name="application_name" msgid="4119979710394894209">"Selector de fons de pantalla animat"</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="live_wallpaper_preview_title" msgid="1130080613611954763">"Visualització prèvia del fons de pantalla animat"</string>
<string name="configure_wallpaper" msgid="7396598925806288258">"Configuració…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Defineix l\'empaperat"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"No hi ha cap empaperat dinàmic."</string>
<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="live_wallpaper_loading" msgid="2488371303130330734">"S\'està carregant el fons de pantalla animat..."</string>
<string name="wallpaper_cancel" msgid="7340240618834119228">"Cancel·la"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 63cd121..ce87bba 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,11 +23,11 @@
<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="configure_wallpaper" msgid="7396598925806288258">"Indstillinger…"</string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Angiv tapet"</string>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"Ingen animeret baggrund."</string>
<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="live_wallpaper_loading" msgid="2488371303130330734">"Indlæser animeret baggrund..."</string>
<string name="wallpaper_cancel" msgid="7340240618834119228">"Annuller"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index de5cb9a..57ab6ff 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,7 +21,7 @@
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="4811278937634144675">"Seleccionar fondo de pantalla animado"</string>
- <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fondos de pantalla animados"</string>
+ <string name="live_wallpaper_picker_label" msgid="3218000114890071946">"Fondos 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>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cb14aa4..6d517aa 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -22,7 +22,7 @@
<string name="application_name" msgid="4119979710394894209">"Live Wallpaper Picker"</string>
<string name="live_wallpaper_picker_title" msgid="4811278937634144675">"انتخاب live wallpaper"</string>
<string name="live_wallpaper_picker_label" msgid="3218000114890071946">"تصویر زمینه متحرک"</string>
- <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"پیش نمایش Live wallpaper"</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>
<string name="live_wallpaper_empty" msgid="4278728108785853407">"تصویر زمینه زنده ای موجود نیست."</string>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index d4f7ef7..55e0d24 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -306,5 +306,9 @@ public class LiveWallpaperPreview extends Activity {
public ParcelFileDescriptor setWallpaper(String name) {
return null;
}
+
+ @Override
+ public void engineShown(IWallpaperEngine engine) throws RemoteException {
+ }
}
}