diff options
| author | Romain Guy <romainguy@android.com> | 2009-10-16 15:07:32 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-10-16 15:46:55 -0700 |
| commit | a45f6642277aee095483ed85b20d807c111b71a1 (patch) | |
| tree | 48f3b00679fb06a4765d4447a173e2a745e7c8cb /AndroidManifest.xml | |
| parent | 1d708e72625ef84dfea65ef65baa6b7bda932ce3 (diff) | |
| download | android_packages_apps_Trebuchet-a45f6642277aee095483ed85b20d807c111b71a1.tar.gz android_packages_apps_Trebuchet-a45f6642277aee095483ed85b20d807c111b71a1.tar.bz2 android_packages_apps_Trebuchet-a45f6642277aee095483ed85b20d807c111b71a1.zip | |
Remove live wallpaper picker from Launcher2.
Change-Id: I2c48f3624128276c3460939960168163d3c74c08
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dfbafdebf..d2dae8887 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,11 +17,12 @@ ** 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"> - + package="com.android.launcher2" + android:sharedUserId="android.uid.shared" + android:sharedUserLabel="@string/uid_name"> + <permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -58,16 +59,10 @@ <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" - --> <application android:name="LauncherApplication" + android:process="android.process.acore" android:label="@string/application_name" android:icon="@drawable/ic_launcher_home"> @@ -97,19 +92,6 @@ </intent-filter> </activity> - <!-- TODO: MOVE TO SETTINGS (or actually maybe to its own package) --> - <!-- Standard picker for live wallpapers --> - <activity android:name="LiveWallpaperPickActivity" - android:icon="@drawable/ic_launcher_appwidget" - android:label="@string/live_wallpaper_picker_title" - 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" /> - <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" |