commit ff649c601d0e2caa5d939f09c7183a8a4d8db60b
author Maurice Lam <yukl@google.com> Tue Jan 20 21:21:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 20 21:21:41 2015 +0000
tree 5cce47e35fa6849bba397dd75715b190b0197007
parent 69b87f79256a5edacb90ab7ccce069737ca59b3d
parent 98f245069b7b0be4f63d27260c536ea768c50a75

Merge "[WifiSetup] Don't pan the window for IME" into lmp-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7fb2603..99133a5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -197,7 +197,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" />