summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFreeman Ng <tenorslowworm@google.com>2011-06-10 14:08:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-10 14:08:33 -0700
commit10d41eca7bbb5f5c9652eb1c3aa80373bfe8b89f (patch)
tree3c6cbda676d48dc345e03e9bd6ad02b1efa717d9
parent851180992874c749ba2c0c5aafb136f4083553a5 (diff)
parenta35506c7fb32906678fe541914f420d19ff17394 (diff)
downloadpackages_apps_Settings-10d41eca7bbb5f5c9652eb1c3aa80373bfe8b89f.tar.gz
packages_apps_Settings-10d41eca7bbb5f5c9652eb1c3aa80373bfe8b89f.tar.bz2
packages_apps_Settings-10d41eca7bbb5f5c9652eb1c3aa80373bfe8b89f.zip
am a35506c7: am f2a9bd33: am 0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2
* commit 'a35506c7fb32906678fe541914f420d19ff17394': add "behind" screen orientation to prevent spurious flipping
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb6405980..8f8600294 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -144,6 +144,7 @@
<activity android:name=".wifi.WifiSettingsForSetupWizardXL"
android:theme="@android:style/Theme.Holo.NoActionBar"
android:windowBackground="@drawable/setups_bg_default"
+ android:screenOrientation="behind"
android:clearTaskOnLaunch="true"
android:windowSoftInputMode="adjustResize"
android:exported="true" />