You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by jc...@apache.org on 2016/07/21 20:03:25 UTC
cordova-plugin-inappbrowser git commit: fix some calls which used api
level 16
Repository: cordova-plugin-inappbrowser
Updated Branches:
refs/heads/master 2a3a0ceca -> 56dca03de
fix some calls which used api level 16
This closes #170
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/56dca03d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/56dca03d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/56dca03d
Branch: refs/heads/master
Commit: 56dca03de77039096fba052881a6323793a5b906
Parents: 2a3a0ce
Author: Vasiliy Makarov <dr...@gmail.com>
Authored: Mon Jun 27 15:04:13 2016 +0300
Committer: Julio C�sar <jc...@gmail.com>
Committed: Thu Jul 21 22:02:25 2016 +0200
----------------------------------------------------------------------
src/android/InAppBrowser.java | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/56dca03d/src/android/InAppBrowser.java
----------------------------------------------------------------------
diff --git a/src/android/InAppBrowser.java b/src/android/InAppBrowser.java
index 30915dc..38c3cbc 100644
--- a/src/android/InAppBrowser.java
+++ b/src/android/InAppBrowser.java
@@ -579,11 +579,15 @@ public class InAppBrowser extends CordovaPlugin {
Resources activityRes = cordova.getActivity().getResources();
int backResId = activityRes.getIdentifier("ic_action_previous_item", "drawable", cordova.getActivity().getPackageName());
Drawable backIcon = activityRes.getDrawable(backResId);
- back.setBackground(null);
+ if (Build.VERSION.SDK_INT >= 16)
+ back.setBackground(null);
+ else
+ back.setBackgroundDrawable(null);
back.setImageDrawable(backIcon);
back.setScaleType(ImageView.ScaleType.FIT_CENTER);
back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
- back.getAdjustViewBounds();
+ if (Build.VERSION.SDK_INT >= 16)
+ back.getAdjustViewBounds();
back.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
@@ -600,11 +604,15 @@ public class InAppBrowser extends CordovaPlugin {
forward.setId(Integer.valueOf(3));
int fwdResId = activityRes.getIdentifier("ic_action_next_item", "drawable", cordova.getActivity().getPackageName());
Drawable fwdIcon = activityRes.getDrawable(fwdResId);
- forward.setBackground(null);
+ if (Build.VERSION.SDK_INT >= 16)
+ forward.setBackground(null);
+ else
+ forward.setBackgroundDrawable(null);
forward.setImageDrawable(fwdIcon);
forward.setScaleType(ImageView.ScaleType.FIT_CENTER);
forward.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
- forward.getAdjustViewBounds();
+ if (Build.VERSION.SDK_INT >= 16)
+ forward.getAdjustViewBounds();
forward.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
@@ -644,11 +652,15 @@ public class InAppBrowser extends CordovaPlugin {
close.setId(Integer.valueOf(5));
int closeResId = activityRes.getIdentifier("ic_action_remove", "drawable", cordova.getActivity().getPackageName());
Drawable closeIcon = activityRes.getDrawable(closeResId);
- close.setBackground(null);
+ if (Build.VERSION.SDK_INT >= 16)
+ close.setBackground(null);
+ else
+ close.setBackgroundDrawable(null);
close.setImageDrawable(closeIcon);
close.setScaleType(ImageView.ScaleType.FIT_CENTER);
back.setPadding(0, this.dpToPixels(10), 0, this.dpToPixels(10));
- close.getAdjustViewBounds();
+ if (Build.VERSION.SDK_INT >= 16)
+ close.getAdjustViewBounds();
close.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org