PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: ff649c6

* commit 'ff649c601d0e2caa5d939f09c7183a8a4d8db60b':
  [WifiSetup] Don't pan the window for IME
This commit is contained in:
Maurice Lam
2015-01-20 21:26:38 +00:00
committed by android-build-merger
parent e7b79f16c1 ff649c601d
commit a1f6660423
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -197,7 +197,8 @@
android:theme="@style/SetupWizardDisableAppStartingTheme" android:theme="@style/SetupWizardDisableAppStartingTheme"
android:label="@string/wifi_setup_wizard_title" android:label="@string/wifi_setup_wizard_title"
android:icon="@drawable/empty_icon" android:icon="@drawable/empty_icon"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:windowSoftInputMode="adjustNothing">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" /> <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />