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

Updating the history configuration. We can switch between histories

Browse Source
This commit is contained in:
Joe Bowser 2012-05-08 13:58:24 -07:00
parent 8ab1733374
commit 4ce585be02
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
framework/src/org/apache/cordova/CordovaWebViewClient.java
View File

@ -203,9 +203,12 @@ public class CordovaWebViewClient extends WebViewClient {
@Override @Override
public void onPageStarted(WebView view, String url, Bitmap favicon) { public void onPageStarted(WebView view, String url, Bitmap favicon) {
// Clear history so history.back() doesn't do anything. // Clear history so history.back() doesn't do anything.
// So we can reinit() native side CallbackServer & PluginManager. // So we can reinit() native side CallbackServer & PluginManager.\
view.clearHistory(); if(!appView.useBrowserHistory)
this.doClearHistory = true; {
view.clearHistory();
this.doClearHistory = true;
}
} }
/** /**

18
framework/src/org/apache/cordova/DroidGap.java
View File

@ -225,16 +225,9 @@ public class DroidGap extends Activity implements CordovaInterface {
getWindow().requestFeature(Window.FEATURE_NO_TITLE); getWindow().requestFeature(Window.FEATURE_NO_TITLE);
if (preferences.prefMatches("fullscreen","true")) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else if(preferences.prefMatches("useBrowserHistory", "true")) {
useBrowserHistory = true;
} else {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
}
// This builds the view. We could probably get away with NOT having a LinearLayout, but I like having a bucket! // This builds the view. We could probably get away with NOT having a LinearLayout, but I like having a bucket!
Display display = getWindowManager().getDefaultDisplay(); Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth(); int width = display.getWidth();
@ -283,7 +276,11 @@ public class DroidGap extends Activity implements CordovaInterface {
// white list of allowed URLs // white list of allowed URLs
// debug setting // debug setting
this.loadConfiguration(); this.loadConfiguration();
//Now we can check the preference
appView.useBrowserHistory = preferences.prefMatches("useBrowserHistory", "true");
//
this.appView.setLayoutParams(new LinearLayout.LayoutParams( this.appView.setLayoutParams(new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
@ -291,7 +288,6 @@ public class DroidGap extends Activity implements CordovaInterface {
// Add web view but make it invisible while loading URL // Add web view but make it invisible while loading URL
this.appView.setVisibility(View.INVISIBLE); this.appView.setVisibility(View.INVISIBLE);
this.appView.useBrowserHistory = useBrowserHistory;
root.addView(this.appView); root.addView(this.appView);
setContentView(root); setContentView(root);