commit fbd65e8f12023d409c9f297a26955b7882e3e37d
author Romain Guy <romainguy@android.com> Mon Nov 09 16:21:13 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 09 16:21:13 2009 -0800
tree 91b753e1bb4b5006e06813405d0692d47910ad1d
parent 3b5dad1462f248b4bdb725a03cad926291117c58
parent 77ba51b00989bb61aafecacd864588892cd97f74

am 77ba51b0: am e9dee57b: Merge change I9d34c514 into eclair

Merge commit '77ba51b00989bb61aafecacd864588892cd97f74' into eclair-mr2-plus-aosp

* commit '77ba51b00989bb61aafecacd864588892cd97f74':
  Disable orientation change based on sensor in the wallpaper picker.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fce4230..bd9a4de 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,8 @@
         <activity
             android:name="WallpaperChooser"
             android:label="@string/pick_wallpaper"
-            android:icon="@drawable/ic_launcher_wallpaper">
+            android:icon="@drawable/ic_launcher_wallpaper"
+            android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />