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/08/28 23:43:14 UTC
[1/2] android commit: Incremeting version check for Android 4.3 API
Level 18
Updated Branches:
refs/heads/master 57bed98cf -> 5f7ce4b86
Incremeting version check for Android 4.3 API Level 18
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/412d97fa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/412d97fa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/412d97fa
Branch: refs/heads/master
Commit: 412d97fa0c80902d53dbdb990f97d2e32f701472
Parents: 57bed98
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jul 30 15:50:30 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Aug 28 14:41:42 2013 -0700
----------------------------------------------------------------------
bin/check_reqs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/412d97fa/bin/check_reqs
----------------------------------------------------------------------
diff --git a/bin/check_reqs b/bin/check_reqs
index d50c78d..4a8abee 100755
--- a/bin/check_reqs
+++ b/bin/check_reqs
@@ -23,4 +23,5 @@ var check_reqs = require('./lib/check_reqs');
if(!check_reqs.run()) {
process.exit(2);
-}
\ No newline at end of file
+}
+
[2/2] android commit: Reverting CB-3949: Squeay wheel gets the grease
Posted by bo...@apache.org.
Reverting CB-3949: Squeay wheel gets the grease
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/5f7ce4b8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/5f7ce4b8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/5f7ce4b8
Branch: refs/heads/master
Commit: 5f7ce4b86810f0c8ccc8aa3efaa85b227fadd599
Parents: 412d97f
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Aug 28 14:37:35 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Aug 28 14:42:23 2013 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaActivity.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/5f7ce4b8/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 9937c3f..d9b07e2 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -241,19 +241,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
}
}
- //CB-3949: Workaround for weird Android Launcher Bug!
- private void checkIntents()
- {
- Intent intent = getIntent();
- String intentAction = intent.getAction();
- if (!isTaskRoot() && intent.hasCategory(Intent.CATEGORY_LAUNCHER) && intentAction != null) {
- if(intentAction.equals(Intent.ACTION_MAIN)) {
- Log.d("Cordova", "This isn't the root activity. Clearing it and returning to the root activity.");
- finish();
- return;
- }
- }
- }
/**
* Called when the activity is first created.
*
@@ -262,7 +249,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
@SuppressWarnings("deprecation")
@Override
public void onCreate(Bundle savedInstanceState) {
- checkIntents();
Config.init(this);
LOG.d(TAG, "CordovaActivity.onCreate()");
super.onCreate(savedInstanceState);
@@ -1092,8 +1078,8 @@ public class CordovaActivity extends Activity implements CordovaInterface {
root.setMinimumWidth(display.getWidth());
root.setOrientation(LinearLayout.VERTICAL);
root.setBackgroundColor(that.getIntegerProperty("backgroundColor", Color.BLACK));
- root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
- ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
+ root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.MATCH_PARENT, 0.0F));
root.setBackgroundResource(that.splashscreen);
// Create and show the dialog