summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-11-19 18:38:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-19 18:38:41 -0800
commit0bcaaed0b425633d9bc5f88ce9fd5b148ef48831 (patch)
tree6188cb274a2d36492ca6396f6d75dd017f80567a
parentca815fee6c3cf84063d9a4ee2455abeefdeae361 (diff)
parent33f09068720749f90dde029d6d17885d6a16994c (diff)
downloadandroid_packages_wallpapers_LivePicker-0bcaaed0b425633d9bc5f88ce9fd5b148ef48831.zip
android_packages_wallpapers_LivePicker-0bcaaed0b425633d9bc5f88ce9fd5b148ef48831.tar.gz
android_packages_wallpapers_LivePicker-0bcaaed0b425633d9bc5f88ce9fd5b148ef48831.tar.bz2
am 33f09068: am ff1c3128: Finish issue #2271640: Fix wallpaper etc docs
Merge commit '33f09068720749f90dde029d6d17885d6a16994c' * commit '33f09068720749f90dde029d6d17885d6a16994c': Finish issue #2271640: Fix wallpaper etc docs
-rw-r--r--Android.mk20
-rw-r--r--android.software.live_wallpaper.xml23
2 files changed, 43 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 0f3dbcd..a682ef3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,11 +15,31 @@
#
LOCAL_PATH := $(call my-dir)
+
+########################
+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
+#
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
+
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+
+include $(BUILD_PREBUILT)
+
+########################
include $(CLEAR_VARS)
#LOCAL_MODULE_TAGS := user
LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
LOCAL_PACKAGE_NAME := LiveWallpapersPicker
LOCAL_CERTIFICATE := platform
diff --git a/android.software.live_wallpaper.xml b/android.software.live_wallpaper.xml
new file mode 100644
index 0000000..bf2b12d
--- /dev/null
+++ b/android.software.live_wallpaper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<!-- This feature should be defined for devices that support live wallpapers.
+ There are minimum hardware requirements to be able to support this
+ feature: robust multiple GL context support, fast enough CPU, enough
+ RAM to allow the wallpaper to be running all of the time. -->
+<permissions>
+ <feature name="android.software.live_wallpaper" />
+</permissions>