commit 50f2081f6bebfa68669e8363baa036da468e9e9b
author Maurice Lam <yukl@google.com> Tue Jan 20 21:49:49 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 20 21:49:49 2015 +0000
tree 67e131fd896fc3d68b6debb5bec4a844cd0d305c
parent f3428e435e9eaf9d8ff6857fe77e08d4846caef2
parent 1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8

am 1cca45bc: Merge "[WifiSetup] Don\'t pan the window for IME" into lmp-mr1-dev automerge: ff649c6 automerge: a1f6660

* commit '1cca45bc6e12a04ce6bde0e5b1c56933869cf9d8':
  [WifiSetup] Don't pan the window for IME

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c79e842..f94539b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -198,7 +198,8 @@
                 android:theme="@style/SetupWizardDisableAppStartingTheme"
                 android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
-                android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />