summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-01-19 06:43:42 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-19 06:43:42 (GMT)
commit25c646f0f0484362b9aa1b804e8592a8bd469ce0 (patch)
tree5b69de4e26abbdd0de919c4befbab93cb9b7bfdf
parentab1983f46ce0ee0c94ea1170d21a67eb4e3c7967 (diff)
parent4c3733f143b6c537488e30059d0177177ba59be8 (diff)
downloadandroid_packages_apps_Trebuchet-25c646f0f0484362b9aa1b804e8592a8bd469ce0.zip
android_packages_apps_Trebuchet-25c646f0f0484362b9aa1b804e8592a8bd469ce0.tar.gz
android_packages_apps_Trebuchet-25c646f0f0484362b9aa1b804e8592a8bd469ce0.tar.bz2
Merge "Adding wallpaper picker preview" into honeycomb
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/drawable/wallpaper_picker_preview.pngbin0 -> 254778 bytes
-rw-r--r--res/xml/wallpaper_picker_preview.xml20
3 files changed, 22 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6cdf205..f9750ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -95,6 +95,8 @@
<action android:name="android.intent.action.SET_WALLPAPER" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <meta-data android:name="android.wallpaper.preview"
+ android:resource="@xml/wallpaper_picker_preview" />
</activity>
<!-- Intent received used to install shortcuts from other applications -->
diff --git a/res/drawable/wallpaper_picker_preview.png b/res/drawable/wallpaper_picker_preview.png
new file mode 100644
index 0000000..926a99c
--- /dev/null
+++ b/res/drawable/wallpaper_picker_preview.png
Binary files differ
diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml
new file mode 100644
index 0000000..d52e0e0
--- /dev/null
+++ b/res/xml/wallpaper_picker_preview.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<wallpaper-preview
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:staticWallpaperPreview="@drawable/wallpaper_picker_preview">
+</wallpaper-preview> \ No newline at end of file