public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Reverting CB-3949: Squeay wheel gets the grease

Browse Source
This commit is contained in:
Joe Bowser 2013-08-28 14:37:35 -07:00
parent 412d97fa0c
commit 5f7ce4b868
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -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. * Called when the activity is first created.
* *
@ -262,7 +249,6 @@ public class CordovaActivity extends Activity implements CordovaInterface {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
checkIntents();
Config.init(this); Config.init(this);
LOG.d(TAG, "CordovaActivity.onCreate()"); LOG.d(TAG, "CordovaActivity.onCreate()");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -1092,8 +1078,8 @@ public class CordovaActivity extends Activity implements CordovaInterface {
root.setMinimumWidth(display.getWidth()); root.setMinimumWidth(display.getWidth());
root.setOrientation(LinearLayout.VERTICAL); root.setOrientation(LinearLayout.VERTICAL);
root.setBackgroundColor(that.getIntegerProperty("backgroundColor", Color.BLACK)); root.setBackgroundColor(that.getIntegerProperty("backgroundColor", Color.BLACK));
root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.FILL_PARENT, 0.0F)); ViewGroup.LayoutParams.MATCH_PARENT, 0.0F));
root.setBackgroundResource(that.splashscreen); root.setBackgroundResource(that.splashscreen);
// Create and show the dialog // Create and show the dialog