diff options
| author | Romain Guy <romainguy@android.com> | 2009-08-13 12:53:24 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-08-13 12:53:24 -0700 |
| commit | 41669fc9c6d4faab98d527c8f4c449725c29c8df (patch) | |
| tree | 0df0fc1044167a2a362a8ac48c4250e04abeb4ef /AndroidManifest.xml | |
| parent | eb2c02eedb72f8b9db2fcace8dcfc6019d04112c (diff) | |
| download | android_packages_apps_Trebuchet-41669fc9c6d4faab98d527c8f4c449725c29c8df.tar.gz android_packages_apps_Trebuchet-41669fc9c6d4faab98d527c8f4c449725c29c8df.tar.bz2 android_packages_apps_Trebuchet-41669fc9c6d4faab98d527c8f4c449725c29c8df.zip | |
Add live wallpapers picker to Launcher2. This is temporary.
This change requires changing the signature and shared user id of Launcher2, we
will have to revert this once we move the wallpapers picker back to Settings.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cdfe585ab..701ca77d8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,10 +17,11 @@ ** limitations under the License. */ --> +<!--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.shared" + android:sharedUserId="android.uid.system" android:sharedUserLabel="@string/uid_name"> <!-- Turned off until there is only one launcher @@ -56,6 +57,7 @@ <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" /> @@ -95,6 +97,18 @@ </intent-filter> </activity> + <!-- TODO: MOVE TO SETTINGS --> + <!-- Standard picker for live wallpapers --> + <activity android:name="LiveWallpaperPickActivity" + android:label="@string/live_wallpaper_picker_title" + android:theme="@*android:style/Theme.Dialog.Alert"> + <intent-filter> + <action android:name="android.service.wallpaper.LIVE_WALLPAPER_CHOOSER" /> + <action android:name="android.intent.action.SET_WALLPAPER" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + <!-- Enable system-default search mode for any activity in Home --> <meta-data android:name="android.app.default_searchable" |