zhaidi/cordova-plugin-inappbrowser
zhaidi/cordova-plugin-inappbrowser
1
0
Fork 0
forked from public/cordova-plugin-inappbrowser
Code Pull Requests Activity

Amazon specific changes:

Browse Source 
Removed reference to closebuttoncaption according to
https://git-wip-us.apache.org/repos/asf?p=cordova-plugin-inappbrowser.git;a=commit;h=50a78baf22843b0df96ccb4ca83a45bd9ef3fc39
This commit is contained in:
Ajitha 2014-10-30 19:54:43 +05:30 committed by Archana Naik
parent e785533ab4
commit 2c4bef1f97
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/amazon/InAppBrowser.java
View File

@ -81,7 +81,6 @@ public class InAppBrowser extends CordovaPlugin {
private static final String LOAD_START_EVENT = "loadstart"; private static final String LOAD_START_EVENT = "loadstart";
private static final String LOAD_STOP_EVENT = "loadstop"; private static final String LOAD_STOP_EVENT = "loadstop";
private static final String LOAD_ERROR_EVENT = "loaderror"; private static final String LOAD_ERROR_EVENT = "loaderror";
private static final String CLOSE_BUTTON_CAPTION = "closebuttoncaption";
private static final String CLEAR_ALL_CACHE = "clearcache"; private static final String CLEAR_ALL_CACHE = "clearcache";
private static final String CLEAR_SESSION_CACHE = "clearsessioncache"; private static final String CLEAR_SESSION_CACHE = "clearsessioncache";
@ -91,7 +90,6 @@ public class InAppBrowser extends CordovaPlugin {
private CallbackContext callbackContext; private CallbackContext callbackContext;
private boolean showLocationBar = true; private boolean showLocationBar = true;
private boolean openWindowHidden = false; private boolean openWindowHidden = false;
private String buttonLabel = "Done";
private boolean clearAllCache= false; private boolean clearAllCache= false;
private boolean clearSessionCache=false; private boolean clearSessionCache=false;
@ -293,14 +291,10 @@ public class InAppBrowser extends CordovaPlugin {
option = new StringTokenizer(features.nextToken(), "="); option = new StringTokenizer(features.nextToken(), "=");
if (option.hasMoreElements()) { if (option.hasMoreElements()) {
String key = option.nextToken(); String key = option.nextToken();
if (key.equalsIgnoreCase(CLOSE_BUTTON_CAPTION)) {
this.buttonLabel = option.nextToken();
} else {
Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE; Boolean value = option.nextToken().equals("no") ? Boolean.FALSE : Boolean.TRUE;
map.put(key, value); map.put(key, value);
} }
} }
}
return map; return map;
} }
} }
@ -477,6 +471,7 @@ public class InAppBrowser extends CordovaPlugin {
return value; return value;
} }
@SuppressLint("NewApi")
public void run() { public void run() {
// Let's create the main dialog // Let's create the main dialog
dialog = new InAppBrowserDialog(cordova.getActivity(), android.R.style.Theme_NoTitleBar); dialog = new InAppBrowserDialog(cordova.getActivity(), android.R.style.Theme_NoTitleBar);
@ -512,9 +507,6 @@ public class InAppBrowser extends CordovaPlugin {
back.setLayoutParams(backLayoutParams); back.setLayoutParams(backLayoutParams);
back.setContentDescription("Back Button"); back.setContentDescription("Back Button");
back.setId(2); back.setId(2);
/*
back.setText("<");
*/
Resources activityRes = cordova.getActivity().getResources(); Resources activityRes = cordova.getActivity().getResources();
int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName()); int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName());
Drawable backIcon = activityRes.getDrawable(backResId); Drawable backIcon = activityRes.getDrawable(backResId);
@ -540,7 +532,6 @@ public class InAppBrowser extends CordovaPlugin {
forward.setLayoutParams(forwardLayoutParams); forward.setLayoutParams(forwardLayoutParams);
forward.setContentDescription("Forward Button"); forward.setContentDescription("Forward Button");
forward.setId(3); forward.setId(3);
//forward.setText(">");
int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName()); int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName());
Drawable fwdIcon = activityRes.getDrawable(fwdResId); Drawable fwdIcon = activityRes.getDrawable(fwdResId);
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
@ -580,14 +571,13 @@ public class InAppBrowser extends CordovaPlugin {
} }
}); });
// Close button // Close/Done button
Button close = new Button(cordova.getActivity()); Button close = new Button(cordova.getActivity());
RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT); RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
closeLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); closeLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
close.setLayoutParams(closeLayoutParams); close.setLayoutParams(closeLayoutParams);
forward.setContentDescription("Close Button"); forward.setContentDescription("Close Button");
close.setId(5); close.setId(5);
//close.setText(buttonLabel);
int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName()); int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName());
Drawable closeIcon = activityRes.getDrawable(closeResId); Drawable closeIcon = activityRes.getDrawable(closeResId);
if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN)
@ -706,8 +696,6 @@ public class InAppBrowser extends CordovaPlugin {
} }
} }
/** /**
* The webview client receives notifications about appView * The webview client receives notifications about appView
*/ */
@ -837,7 +825,6 @@ public class InAppBrowser extends CordovaPlugin {
} catch (JSONException ex) { } catch (JSONException ex) {
Log.d(LOG_TAG, "Should never happen"); Log.d(LOG_TAG, "Should never happen");
} }
} }
} }
} }