Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A668310C50 for ; Wed, 28 Aug 2013 21:43:14 +0000 (UTC) Received: (qmail 6070 invoked by uid 500); 28 Aug 2013 21:43:14 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 6034 invoked by uid 500); 28 Aug 2013 21:43:14 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 5988 invoked by uid 99); 28 Aug 2013 21:43:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Aug 2013 21:43:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4DF903207D0; Wed, 28 Aug 2013 21:43:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Wed, 28 Aug 2013 21:43:15 -0000 Message-Id: In-Reply-To: <80a40f367dc7479b8a4e382497a0b678@git.apache.org> References: <80a40f367dc7479b8a4e382497a0b678@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] android commit: Reverting CB-3949: Squeay wheel gets the grease 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 Authored: Wed Aug 28 14:37:35 2013 -0700 Committer: Joe Bowser 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