commit 77ba51b00989bb61aafecacd864588892cd97f74
author Romain Guy <romainguy@android.com> Mon Nov 09 16:15:58 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 09 16:15:58 2009 -0800
tree 91b753e1bb4b5006e06813405d0692d47910ad1d
parent ee2c84e5a90b9778547a2393715529079f3f011a
parent e9dee57b15297de41c5127d075751a7215704f20

am e9dee57b: Merge change I9d34c514 into eclair

Merge commit 'e9dee57b15297de41c5127d075751a7215704f20' into eclair-mr2

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