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
This commit is contained in:
Maurice Lam
2015-01-20 21:49:49 +00:00
committed by Android Git Automerger

View File

@@ -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" />