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

Outsmarted by vim, needed Eclipse to clean this up

Browse Source
This commit is contained in:
Joe Bowser 2014-04-30 15:09:54 -07:00
parent 105ccc81a5
commit 04b3fc0268
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
framework/src/org/apache/cordova/AndroidWebView.java
View File

@ -166,11 +166,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{ {
Log.d(TAG, "Your activity must implement CordovaInterface to work"); Log.d(TAG, "Your activity must implement CordovaInterface to work");
} }
<<<<<<< HEAD this.setWebChromeClient(this.makeWebChromeClient());
this.setWebChromeClient(this.makeChromeClient());
this.initWebViewClient(this.cordova);
=======
>>>>>>> df05f3a3c07c0630c3d598409289db7a8f3c87e3
this.loadConfiguration(); this.loadConfiguration();
this.setup(); this.setup();
} }
@ -193,10 +189,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{ {
Log.d(TAG, "Your activity must implement CordovaInterface to work"); Log.d(TAG, "Your activity must implement CordovaInterface to work");
} }
<<<<<<< HEAD this.setWebChromeClient(this.makeWebChromeClient());
this.setWebChromeClient(this.makeChromeClient());
=======
>>>>>>> df05f3a3c07c0630c3d598409289db7a8f3c87e3
this.loadConfiguration(); this.loadConfiguration();
this.setup(); this.setup();
} }
@ -220,22 +213,12 @@ public class AndroidWebView extends WebView implements CordovaWebView {
{ {
Log.d(TAG, "Your activity must implement CordovaInterface to work"); Log.d(TAG, "Your activity must implement CordovaInterface to work");
} }
<<<<<<< HEAD this.setWebChromeClient(this.makeWebChromeClient());
this.setWebChromeClient(this.makeChromeClient());
this.initWebViewClient(this.cordova);
=======
>>>>>>> df05f3a3c07c0630c3d598409289db7a8f3c87e3
this.loadConfiguration(); this.loadConfiguration();
this.setup(); this.setup();
} }
/** /**
<<<<<<< HEAD
* set the WebViewClient, but provide special case handling for IceCreamSandwich.
*/
private void initWebViewClient(CordovaInterface cordova) {
this.setWebViewClient(this.makeWebViewClient());
=======
* Create a default WebViewClient object for this webview. This can be overridden by the * Create a default WebViewClient object for this webview. This can be overridden by the
* main application's CordovaActivity subclass. * main application's CordovaActivity subclass.
* *
@ -262,7 +245,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
@Override @Override
public CordovaChromeClient makeWebChromeClient() { public CordovaChromeClient makeWebChromeClient() {
return (CordovaChromeClient) new AndroidChromeClient(this.cordova); return (CordovaChromeClient) new AndroidChromeClient(this.cordova);
>>>>>>> df05f3a3c07c0630c3d598409289db7a8f3c87e3
} }
/** /**
@ -1112,21 +1094,6 @@ public class AndroidWebView extends WebView implements CordovaWebView {
public View getView() { public View getView() {
return this; return this;
} }
<<<<<<< HEAD
@Override
public CordovaWebViewClient makeWebViewClient() {
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) {
return (CordovaWebViewClient) new AndroidWebViewClient(this.cordova, this);
} else {
return (CordovaWebViewClient) new IceCreamCordovaWebViewClient(this.cordova, this);
}
}
@Override
public CordovaChromeClient makeChromeClient() {
return (CordovaChromeClient) new AndroidChromeClient(this.cordova, this);
}
=======
>>>>>>> df05f3a3c07c0630c3d598409289db7a8f3c87e3
} }