From 4f703b263ad9c8aa13d8b438300b468b690a3195 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 14 May 2012 11:31:37 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I127e2a18ac6b41b48cf214691914c17ec4ce9d63 --- res/values-da/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ "Vælg animeret baggrund" "Levende tapet" "Eksempel på animeret baggrund" - "Indstillinger …" + "Indstillinger…" "Angiv tapet" "Ingen animeret baggrund." "Angiv tapet" "%1$saf %2$s" - "Indlæser animeret baggrund ..." + "Indlæser animeret baggrund..." "Annuller" -- cgit v1.2.3 From fa07e73a96867bd498abf166d252636f5006ad86 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Fri, 25 May 2012 11:33:39 -0700 Subject: Import translations. DO NOT MERGE Change-Id: Iecf458bf4f6d7e2ac2a42dfd4aa0577151906d15 --- res/values-es/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"> "Selector de fondo de pantalla animado" "Seleccionar fondo de pantalla animado" - "Fondos de pantalla animados" + "Fondos animados" "Vista previa de fondo de pantalla animado" "Ajustes…" "Establecer fondo de pantalla" -- cgit v1.2.3 From 97f147d7aa1f22b73d285ef7b287b44eab9ec36e Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 22 May 2012 14:17:28 -0700 Subject: Get rid of LOCAL_MODULE_TAGS := user Change-Id: I03d7dad3333b58709b8ba594d2bb44ca85462c54 --- Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/Android.mk b/Android.mk index d532303..1a5407a 100644 --- a/Android.mk +++ b/Android.mk @@ -21,8 +21,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.software.live_wallpaper.xml -#LOCAL_MODULE_TAGS := user - LOCAL_MODULE_CLASS := ETC # This will install the file in /system/etc/permissions -- cgit v1.2.3 From 0a5fc6f41412e341059a14abe808b28c5933f7dc Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 15 Jun 2012 10:42:00 -0700 Subject: Import translations. DO NOT MERGE Change-Id: Ib32bae9ab70c9c496beb5584b56edb4e6f5b9d8d --- res/values-ca/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ "Selector de fons de pantalla animat" "Selecció del fons de pantalla animat" "Fons de pantalla animats" - "Visualització prèvia de l\'empaperat dinàmic" + "Visualització prèvia del fons de pantalla animat" "Configuració…" "Defineix l\'empaperat" "No hi ha cap empaperat dinàmic." "Defineix l\'empaperat" "%1$s per %2$s" - "S\'està carregant l\'empaperat dinàmic..." + "S\'està carregant el fons de pantalla animat..." "Cancel·la" -- cgit v1.2.3 From e57c90c3924a2ad97433809a5224739672323a4d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 12 Jul 2012 10:37:07 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I19ddbd20086ecc524f6e1103c2368c4d74afea0d Auto-generated-cl: translation import --- res/values-fa/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ "Live Wallpaper Picker" "انتخاب live wallpaper" "تصویر زمینه متحرک" - "پیش نمایش Live wallpaper" + "پیش‌نمایش Live wallpaper" "تنظیمات..." "تنظیم تصویر زمینه" "تصویر زمینه زنده ای موجود نیست." -- cgit v1.2.3 From 40db1c1b930f1d816ecc56f39445843eb72b4642 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 20 Aug 2012 12:31:14 -0700 Subject: Install the permission xml file if LiveWallpapersPicker is installed. Bug: 7019907 Change-Id: I75ee7df305e9e4f2ff0f8816d77ed7344a6db1ab --- Android.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 1a5407a..75b3388 100644 --- a/Android.mk +++ b/Android.mk @@ -23,16 +23,15 @@ LOCAL_MODULE := android.software.live_wallpaper.xml 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) @@ -40,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 -- cgit v1.2.3 From f14b1d2e17ee862b84c9acb88f299984c6e969d9 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Sun, 16 Sep 2012 00:01:18 -0700 Subject: Update to follow framework. Change-Id: I38c6e59234432b103a619dbf5dab0b1fd029f101 --- src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 4 ++++ 1 file changed, 4 insertions(+) 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 { + } } } -- cgit v1.2.3