LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change I793a35a9 into eclair

Browse Source 
* changes:
  ADT now launches app as if launched from launcher.
This commit is contained in:
Android (Google) Code Review
2009-11-06 14:08:24 -05:00
parent 7853d243aa efc6be0e33
commit 396a10e48d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/ActivityLaunchAction.java
View File

@@ -28,10 +28,10 @@ public class ActivityLaunchAction implements IAndroidLaunchAction {
private final String mActivity; private final String mActivity;
private final ILaunchController mLaunchController; private final ILaunchController mLaunchController;
/** /**
* Creates a ActivityLaunchAction * Creates a ActivityLaunchAction
* *
* @param activity fully qualified activity name to launch * @param activity fully qualified activity name to launch
* @param controller the {@link ILaunchController} that performs launch * @param controller the {@link ILaunchController} that performs launch
*/ */
@@ -39,13 +39,13 @@ public class ActivityLaunchAction implements IAndroidLaunchAction {
mActivity = activity; mActivity = activity;
mLaunchController = controller; mLaunchController = controller;
} }
/** /**
* Launches the activity on targeted device * Launches the activity on targeted device
* *
* @param info the {@link DelayedLaunchInfo} that contains launch details * @param info the {@link DelayedLaunchInfo} that contains launch details
* @param device the Android device to perform action on * @param device the Android device to perform action on
* *
* @see IAndroidLaunchAction#doLaunchAction(DelayedLaunchInfo, IDevice) * @see IAndroidLaunchAction#doLaunchAction(DelayedLaunchInfo, IDevice)
*/ */
public boolean doLaunchAction(DelayedLaunchInfo info, IDevice device) { public boolean doLaunchAction(DelayedLaunchInfo info, IDevice device) {
@@ -65,7 +65,9 @@ public class ActivityLaunchAction implements IAndroidLaunchAction {
: "") //$NON-NLS-1$ : "") //$NON-NLS-1$
+ " -n " //$NON-NLS-1$ + " -n " //$NON-NLS-1$
+ info.getPackageName() + "/" //$NON-NLS-1$ + info.getPackageName() + "/" //$NON-NLS-1$
+ mActivity.replaceAll("\\$", "\\\\\\$"), //$NON-NLS-1$ //$NON-NLS-2$ + mActivity.replaceAll("\\$", "\\\\\\$") //$NON-NLS-1$ //$NON-NLS-2$
+ " -a android.intent.action.MAIN" //$NON-NLS-1$
+ " -c android.intent.category.LAUNCHER", //$NON-NLS-1$
new AMReceiver(info, device, mLaunchController)); new AMReceiver(info, device, mLaunchController));
// if the app is not a debug app, we need to do some clean up, as // if the app is not a debug app, we need to do some clean up, as
@@ -84,14 +86,14 @@ public class ActivityLaunchAction implements IAndroidLaunchAction {
} }
return true; return true;
} }
/** /**
* Returns a description of the activity being launched * Returns a description of the activity being launched
* *
* @see IAndroidLaunchAction#getLaunchDescription() * @see IAndroidLaunchAction#getLaunchDescription()
*/ */
public String getLaunchDescription() { public String getLaunchDescription() {
return String.format("%1$s activity launch", mActivity); return String.format("%1$s activity launch", mActivity);
} }
} }