github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java
	framework/src/org/apache/cordova/CordovaChromeClient.java
	framework/src/org/apache/cordova/CordovaWebView.java
	framework/src/org/apache/cordova/CordovaWebViewClient.java
	framework/src/org/apache/cordova/PluginManager.java
This commit is contained in:
Andrew Grieve
2014-07-07 16:23:51 -04:00
parent bdf2f22f81 0f15608175
commit 1571b26a65
13 changed files with 261 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/project/AndroidManifest.xml
+1 -1
View File
@@ -38,7 +38,7 @@
android:label="@string/activity_name"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:windowSoftInputMode="adjustPan"
android:windowSoftInputMode="adjustResize"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">
<intent-filter android:label="@string/launcher_name">
<action android:name="android.intent.action.MAIN" />