Merge branch 'CB-5109' of https://github.com/Touchit/cordova-plugin-inappbrowser
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/22b3f0cc Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/22b3f0cc Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/22b3f0cc Branch: refs/heads/master Commit: 22b3f0ccd469b690e1f6db015cafe085e80ecea0 Parents: 6e0ea33 d828197 Author: Jesse MacFadyen <[email protected]> Authored: Thu Sep 18 16:44:04 2014 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Thu Sep 18 16:44:04 2014 -0700 ---------------------------------------------------------------------- doc/fr/index.md | 14 ++- doc/index.md | 10 ++ plugin.xml | 20 +++- src/windows/InAppBrowserProxy.js | 174 ++++++++++++++++++++++++++++++++++ www/InAppBrowser.js | 98 +++++++++++++++++++ www/inappbrowser.js | 98 ------------------- 6 files changed, 309 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/22b3f0cc/doc/fr/index.md ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/22b3f0cc/doc/index.md ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/22b3f0cc/plugin.xml ---------------------------------------------------------------------- diff --cc plugin.xml index f190ba1,1ee223f..1983990 --- a/plugin.xml +++ b/plugin.xml @@@ -78,26 -78,9 +78,26 @@@ </config-file> <source-file src="src/amazon/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" /> + <source-file src="src/android/InAppBrowserDialog.java" target-dir="src/org/apache/cordova/inappbrowser" /> <source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" /> + + <!-- drawable src/android/resources --> + <resource-file src="src/android/res/drawable-hdpi/ic_action_next_item.png" target="res/drawable-hdpi/ic_action_next_item.png" /> + <resource-file src="src/android/res/drawable-mdpi/ic_action_next_item.png" target="res/drawable-mdpi/ic_action_next_item.png" /> + <resource-file src="src/android/res/drawable-xhdpi/ic_action_next_item.png" target="res/drawable-xhdpi/ic_action_next_item.png" /> + <resource-file src="src/android/res/drawable-xxhdpi/ic_action_next_item.png" target="res/drawable-xxhdpi/ic_action_next_item.png" /> + + <resource-file src="src/android/res/drawable-hdpi/ic_action_previous_item.png" target="res/drawable-hdpi/ic_action_previous_item.png" /> + <resource-file src="src/android/res/drawable-mdpi/ic_action_previous_item.png" target="res/drawable-mdpi/ic_action_previous_item.png" /> + <resource-file src="src/android/res/drawable-xhdpi/ic_action_previous_item.png" target="res/drawable-xhdpi/ic_action_previous_item.png" /> + <resource-file src="src/android/res/drawable-xxhdpi/ic_action_previous_item.png" target="res/drawable-xxhdpi/ic_action_previous_item.png" /> + + <resource-file src="src/android/res/drawable-hdpi/ic_action_remove.png" target="res/drawable-hdpi/ic_action_remove.png" /> + <resource-file src="src/android/res/drawable-mdpi/ic_action_remove.png" target="res/drawable-mdpi/ic_action_remove.png" /> + <resource-file src="src/android/res/drawable-xhdpi/ic_action_remove.png" target="res/drawable-xhdpi/ic_action_remove.png" /> + <resource-file src="src/android/res/drawable-xxhdpi/ic_action_remove.png" target="res/drawable-xxhdpi/ic_action_remove.png" /> </platform> - + <!-- ubuntu --> <platform name="ubuntu"> <js-module src="www/inappbrowser.js" name="inappbrowser">
