You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/02/21 19:46:04 UTC
[6/6] android commit: CB-2504: Merged overscroll disallowance,
needed to deal with merge conflict with the InAppStorage toggle
Updated Branches:
refs/heads/master 5092b2931 -> a30c2b6a7
CB-2504: Merged overscroll disallowance, needed to deal with merge conflict with the InAppStorage toggle
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a30c2b6a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a30c2b6a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a30c2b6a
Branch: refs/heads/master
Commit: a30c2b6a75691b86da01ca8c849d187a6b751a7b
Parents: 2660eeb f415664
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Feb 21 10:45:50 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Feb 21 10:45:50 2013 -0800
----------------------------------------------------------------------
framework/src/org/apache/cordova/Config.java | 5 +++++
framework/src/org/apache/cordova/DroidGap.java | 8 ++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a30c2b6a/framework/src/org/apache/cordova/Config.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/Config.java
index e42d761,a9411ff..f5de38d
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@@ -142,12 -142,12 +142,17 @@@ public class Config
{
boolean value = xml.getAttributeValue(null, "value").equals("true");
action.getIntent().putExtra(name, value);
+ }
+ else if(name.equals("InAppBrowserStorageEnabled"))
+ {
+ boolean value = xml.getAttributeValue(null, "value").equals("true");
+ action.getIntent().putExtra(name, value);
}
+ else if(name.equals("disallowOverscroll"))
+ {
+ boolean value = xml.getAttributeValue(null, "value").equals("true");
+ action.getIntent().putExtra(name, value);
+ }
else
{
String value = xml.getAttributeValue(null, "value");