github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

If multitasking is turned on (keepRunning=true), then temporarily disable it when starting a new activity that returns a result - such as camera.

Browse Source
This commit is contained in:
Bryce Curtis 2010-12-06 16:48:06 -06:00
parent 43b6b6d34e
commit 26adfb6346
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
framework/src/com/phonegap/DroidGap.java
View File

@ -121,6 +121,7 @@ public class DroidGap extends PhonegapActivity {
// Plugin to call when activity result is received // Plugin to call when activity result is received
private Plugin activityResultCallback = null; private Plugin activityResultCallback = null;
private boolean activityResultKeepRunning;
// Flag indicates that a loadUrl timeout occurred // Flag indicates that a loadUrl timeout occurred
private int loadUrlTimeout = 0; private int loadUrlTimeout = 0;
@ -185,6 +186,7 @@ public class DroidGap extends PhonegapActivity {
// Create web container // Create web container
this.appView = new WebView(DroidGap.this); this.appView = new WebView(DroidGap.this);
this.appView.setId(100);
this.appView.setLayoutParams(new LinearLayout.LayoutParams( this.appView.setLayoutParams(new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
@ -1061,6 +1063,14 @@ public class DroidGap extends PhonegapActivity {
*/ */
public void startActivityForResult(Plugin command, Intent intent, int requestCode) { public void startActivityForResult(Plugin command, Intent intent, int requestCode) {
this.activityResultCallback = command; this.activityResultCallback = command;
this.activityResultKeepRunning = this.keepRunning;
// If multitasking turned on, then disable it for activities that return results
if (command != null) {
this.keepRunning = false;
}
// Start activity
super.startActivityForResult(intent, requestCode); super.startActivityForResult(intent, requestCode);
} }
@ -1078,7 +1088,10 @@ public class DroidGap extends PhonegapActivity {
super.onActivityResult(requestCode, resultCode, intent); super.onActivityResult(requestCode, resultCode, intent);
Plugin callback = this.activityResultCallback; Plugin callback = this.activityResultCallback;
if (callback != null) { if (callback != null) {
callback.onActivityResult(requestCode, resultCode, intent); callback.onActivityResult(requestCode, resultCode, intent);
// Restore multitasking state
this.keepRunning = this.activityResultKeepRunning;
} }
} }