summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2009-08-20 19:33:42 -0700
committerDianne Hackborn <hackbod@google.com>2009-08-20 19:33:42 -0700
commit02e638e6bf6dac903396a67029d4d48e3cfa87d9 (patch)
tree6aec18187614f696cfa57beac0a2ced8911d38c4 /AndroidManifest.xml
parent7c312c15e33b6cffbda707429e88ade498fc9f5e (diff)
downloadandroid_packages_apps_Trebuchet-02e638e6bf6dac903396a67029d4d48e3cfa87d9.zip
android_packages_apps_Trebuchet-02e638e6bf6dac903396a67029d4d48e3cfa87d9.tar.gz
android_packages_apps_Trebuchet-02e638e6bf6dac903396a67029d4d48e3cfa87d9.tar.bz2
Implement previews in the wallpaper picker.
Note that the UI is ugly ugly ugly, but previews are actually working.
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 701ca77..6b49b64 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,9 +20,7 @@
<!--TODO MAKE THE sharedUserId be uid.system again !! -->
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.launcher2"
- android:sharedUserId="android.uid.system"
- android:sharedUserLabel="@string/uid_name">
+ package="com.android.launcher2">
<!-- Turned off until there is only one launcher
<permission
@@ -57,13 +55,16 @@
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.SET_WALLPAPER" />
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
- <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
+ <!-- these two are only needed for the wallpaper picker -->
+ <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />
+ <uses-permission android:name="android.permission.BIND_WALLPAPER" />
+
<!-- During development, run outside acore
android:process="android.process.acore"
-->
@@ -97,11 +98,11 @@
</intent-filter>
</activity>
- <!-- TODO: MOVE TO SETTINGS -->
+ <!-- TODO: MOVE TO SETTINGS (or actually maybe to its own package) -->
<!-- Standard picker for live wallpapers -->
<activity android:name="LiveWallpaperPickActivity"
android:label="@string/live_wallpaper_picker_title"
- android:theme="@*android:style/Theme.Dialog.Alert">
+ android:theme="@android:style/Theme.Wallpaper">
<intent-filter>
<action android:name="android.service.wallpaper.LIVE_WALLPAPER_CHOOSER" />
<action android:name="android.intent.action.SET_WALLPAPER" />