commit fa0dc56b9d264bc38a7b508ccfbbc2bdcb475d73
author Romain Guy <romainguy@android.com> Mon Nov 09 16:26:30 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 09 16:26:30 2009 -0800
tree eb9aadee56908ad0c0dbc6808040442ef6ea198c
parent cbf188d342f9f4ba64ae3c27067fe09ab5d52a7b
parent fbd65e8f12023d409c9f297a26955b7882e3e37d

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

Merge commit 'fbd65e8f12023d409c9f297a26955b7882e3e37d'

* commit 'fbd65e8f12023d409c9f297a26955b7882e3e37d':
  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" />