null for this specified project, for any device.
+ * @param project the project for which to reset all installations.
+ */
+ public void resetInstallationFor(IProject project) {
+ synchronized (mInstallList) {
+ for (int i = 0 ; i < mInstallList.size() ;) {
+ ApkInstall install = mInstallList.get(i);
+ if (install.project == project) {
+ mInstallList.remove(i);
+ } else {
+ i++;
+ }
+ }
+ }
+ }
+
+ private ApkInstallManager() {
+ AndroidDebugBridge.addDeviceChangeListener(this);
+ AndroidDebugBridge.addDebugBridgeChangeListener(this);
+ ResourceMonitor.getMonitor().addProjectListener(this);
+ }
+
+ /*
+ * Responds to a bridge change by clearing the full installation list.
+ * (non-Javadoc)
+ * @see com.android.ddmlib.AndroidDebugBridge.IDebugBridgeChangeListener#bridgeChanged(com.android.ddmlib.AndroidDebugBridge)
+ */
+ public void bridgeChanged(AndroidDebugBridge bridge) {
+ // the bridge changed, there is no way to know which IDevice will be which.
+ // We reset everything
+ synchronized (mInstallList) {
+ mInstallList.clear();
+ }
+ }
+
+ /*
+ * Responds to a device being disconnected by removing all installations related to this device.
+ * (non-Javadoc)
+ * @see com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener#deviceDisconnected(com.android.ddmlib.Device)
+ */
+ public void deviceDisconnected(Device device) {
+ synchronized (mInstallList) {
+ for (int i = 0 ; i < mInstallList.size() ;) {
+ ApkInstall install = mInstallList.get(i);
+ if (install.device == device) {
+ mInstallList.remove(i);
+ } else {
+ i++;
+ }
+ }
+ }
+ }
+
+ /*
+ * Responds to a close project by resetting all its installation.
+ * (non-Javadoc)
+ * @see com.android.ide.eclipse.editors.resources.manager.ResourceMonitor.IProjectListener#projectClosed(org.eclipse.core.resources.IProject)
+ */
+ public void projectClosed(IProject project) {
+ resetInstallationFor(project);
+ }
+
+ /*
+ * Responds to a close project by resetting all its installation.
+ * (non-Javadoc)
+ * @see com.android.ide.eclipse.editors.resources.manager.ResourceMonitor.IProjectListener#projectDeleted(org.eclipse.core.resources.IProject)
+ */
+ public void projectDeleted(IProject project) {
+ resetInstallationFor(project);
+ }
+
+ /*
+ * Does nothing
+ * (non-Javadoc)
+ * @see com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener#deviceChanged(com.android.ddmlib.Device, int)
+ */
+ public void deviceChanged(Device device, int changeMask) {
+ // nothing to do.
+ }
+
+ /*
+ * Does nothing
+ * (non-Javadoc)
+ * @see com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener#deviceConnected(com.android.ddmlib.Device)
+ */
+ public void deviceConnected(Device device) {
+ // nothing to do.
+ }
+
+ /*
+ * Does nothing
+ * (non-Javadoc)
+ * @see com.android.ide.eclipse.editors.resources.manager.ResourceMonitor.IProjectListener#projectOpened(org.eclipse.core.resources.IProject)
+ */
+ public void projectOpened(IProject project) {
+ // nothing to do.
+ }
+
+ /*
+ * Does nothing
+ * (non-Javadoc)
+ * @see com.android.ide.eclipse.editors.resources.manager.ResourceMonitor.IProjectListener#projectOpenedWithWorkspace(org.eclipse.core.resources.IProject)
+ */
+ public void projectOpenedWithWorkspace(IProject project) {
+ // nothing to do.
+ }
+}
From 2f1d5e3425bf4a530fc74d0c0c1448fd97547b8f Mon Sep 17 00:00:00 2001
From: Amith Yamasani <>
Date: Mon, 30 Mar 2009 07:28:42 -0700
Subject: [PATCH 06/45] AI 143472: Reduce dictionary size. Changed the tree
structure to have variable length nodes to save an average of 21% on the
dictionary size. Created a shortened English dictionary for Dream - 50K
words. Added a shortened Spanish dictionary for Dream - 32K words.
BUG=1743626
Automated import of CL 143472
---
.../tools/dict/MakeBinaryDictionary.java | 100 ++++++++++++------
1 file changed, 67 insertions(+), 33 deletions(-)
diff --git a/tools/makedict/src/com/android/tools/dict/MakeBinaryDictionary.java b/tools/makedict/src/com/android/tools/dict/MakeBinaryDictionary.java
index cbe702872..8a8a677da 100755
--- a/tools/makedict/src/com/android/tools/dict/MakeBinaryDictionary.java
+++ b/tools/makedict/src/com/android/tools/dict/MakeBinaryDictionary.java
@@ -45,6 +45,10 @@ public class MakeBinaryDictionary {
public static final String TAG_WORD = "w";
public static final String ATTR_FREQ = "f";
+ private static final int FLAG_ADDRESS_MASK = 0x400000;
+ private static final int FLAG_TERMINAL_MASK = 0x800000;
+ private static final int ADDRESS_MASK = 0x3FFFFF;
+
public static final CharNode EMPTY_NODE = new CharNode();
Listnull if not
+ * specified.
+ *
+ * @param configuration the {@link ILaunchConfiguration} to retrieve the test package info from
+ * @return the test package or null.
+ */
+ private String getTestPackage(ILaunchConfiguration configuration) {
+ // try to retrieve a package name from the JUnit container attribute
+ String containerHandle = getStringLaunchAttribute(
+ JUnitLaunchConfigurationConstants.ATTR_TEST_CONTAINER, configuration);
+ if (containerHandle != null && containerHandle.length() > 0) {
+ IJavaElement element = JavaCore.create(containerHandle);
+ // containerHandle could be a IProject, check if its a java package
+ if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
+ return element.getElementName();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the test class stored in the launch configuration.
+ *
+ * @param configuration the {@link ILaunchConfiguration} to retrieve the test class info from
+ * @return the test class. null if not specified.
+ */
+ private String getTestClass(ILaunchConfiguration configuration) {
+ return getStringLaunchAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
+ configuration);
+ }
+
+ /**
+ * Returns the test method stored in the launch configuration.
+ *
+ * @param configuration the {@link ILaunchConfiguration} to retrieve the test method info from
+ * @return the test method. null if not specified.
+ */
+ private String getTestMethod(ILaunchConfiguration configuration) {
+ return getStringLaunchAttribute(JUnitLaunchConfigurationConstants.ATTR_TEST_METHOD_NAME,
+ configuration);
+ }
+
/**
* Gets a instrumentation runner for the launch.
*
@@ -114,11 +167,29 @@ public class AndroidJUnitLaunchConfigDelegate extends LaunchConfigDelegate {
}
private String getRunnerFromConfig(ILaunchConfiguration configuration) throws CoreException {
- String runner = configuration.getAttribute(ATTR_INSTR_NAME, EMPTY_STRING);
- if (runner.length() < 1) {
- return null;
+ return getStringLaunchAttribute(ATTR_INSTR_NAME, configuration);
+ }
+
+ /**
+ * Helper method to retrieve a string attribute from the launch configuration
+ *
+ * @param attributeName name of the launch attribute
+ * @param configuration the {@link ILaunchConfiguration} to retrieve the attribute from
+ * @return the attribute's value. null if not found.
+ */
+ private String getStringLaunchAttribute(String attributeName,
+ ILaunchConfiguration configuration) {
+ try {
+ String attrValue = configuration.getAttribute(attributeName, EMPTY_STRING);
+ if (attrValue.length() < 1) {
+ return null;
+ }
+ return attrValue;
+ } catch (CoreException e) {
+ AdtPlugin.log(e, String.format("Error when retrieving launch info %1$s", //$NON-NLS-1$
+ attributeName));
}
- return runner;
+ return null;
}
/**
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java
index eb5748269..584d45eb1 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java
@@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.launch.junit;
import com.android.ide.eclipse.adt.AdtPlugin;
import com.android.ide.eclipse.adt.launch.MainLaunchConfigTab;
import com.android.ide.eclipse.common.AndroidConstants;
+import com.android.ide.eclipse.common.project.BaseProjectHelper;
import com.android.ide.eclipse.common.project.ProjectChooserHelper;
import org.eclipse.core.resources.IProject;
@@ -241,7 +242,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
private void createTestContainerSelectionGroup(Composite comp) {
mTestContainerRadioButton = new Button(comp, SWT.RADIO);
mTestContainerRadioButton.setText(
- JUnitMessages.JUnitLaunchConfigurationTab_label_containerTest);
+ "Run all tests in the selected project, or package");
GridData gd = new GridData();
gd.horizontalSpan = 3;
mTestContainerRadioButton.setLayoutData(gd);
@@ -249,12 +250,12 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
public void widgetSelected(SelectionEvent e) {
if (mTestContainerRadioButton.getSelection()) {
testModeChanged();
- }
+ }
}
public void widgetDefaultSelected(SelectionEvent e) {
}
});
-
+
mContainerText = new Text(comp, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalIndent = 25;
@@ -265,7 +266,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
updateLaunchConfigurationDialog();
}
});
-
+
mContainerSearchButton = new Button(comp, SWT.PUSH);
mContainerSearchButton.setText(JUnitMessages.JUnitLaunchConfigurationTab_label_search);
mContainerSearchButton.addSelectionListener(new SelectionAdapter() {
@@ -821,7 +822,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
@SuppressWarnings("unchecked")
private IJavaElement chooseContainer(IJavaElement initElement) {
- Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IJavaProject.class,
+ Class[] acceptedClasses = new Class[] { IJavaProject.class,
IPackageFragment.class };
TypedElementSelectionValidator validator = new TypedElementSelectionValidator(
acceptedClasses, false) {
@@ -839,7 +840,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
if (element instanceof IPackageFragmentRoot &&
((IPackageFragmentRoot) element).isArchive()) {
return false;
- }
+ }
try {
if (element instanceof IPackageFragment &&
!((IPackageFragment) element).hasChildren()) {
@@ -852,7 +853,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
}
};
- StandardJavaElementContentProvider provider = new StandardJavaElementContentProvider();
+ AndroidJavaElementContentProvider provider = new AndroidJavaElementContentProvider();
ILabelProvider labelProvider = new JavaElementLabelProvider(
JavaElementLabelProvider.SHOW_DEFAULT);
ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(),
@@ -974,4 +975,23 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
mInstrumentations = null;
mInstrumentationCombo.removeAll();
}
+
+ /**
+ * Overrides the {@link StandardJavaElementContentProvider} to only display Android projects
+ */
+ private static class AndroidJavaElementContentProvider
+ extends StandardJavaElementContentProvider {
+
+ /**
+ * Override parent to return only Android projects if at the root. Otherwise, use parent
+ * functionality.
+ */
+ @Override
+ public Object[] getChildren(Object element) {
+ if (element instanceof IJavaModel) {
+ return BaseProjectHelper.getAndroidProjects((IJavaModel) element);
+ }
+ return super.getChildren(element);
+ }
+ }
}
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitPropertyTester.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitPropertyTester.java
new file mode 100644
index 000000000..eadafee77
--- /dev/null
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitPropertyTester.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Eclipse Public License, Version 1.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.eclipse.org/org/documents/epl-v10.php
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.ide.eclipse.adt.launch.junit;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jdt.core.IClassFile;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IPackageFragment;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
+
+/**
+ * A {@link PropertyTester} that checks if selected elements can be run as Android
+ * JUnit tests.
+ *
+ * Based on org.eclipse.jdt.internal.junit.JUnitPropertyTester. The only substantial difference in
+ * this implementation is source folders cannot be run as Android JUnit.
+ */
+@SuppressWarnings("restriction")
+public class AndroidJUnitPropertyTester extends PropertyTester {
+ private static final String PROPERTY_IS_TEST = "isTest"; //$NON-NLS-1$
+
+ private static final String PROPERTY_CAN_LAUNCH_AS_JUNIT_TEST = "canLaunchAsJUnit"; //$NON-NLS-1$
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jdt.internal.corext.refactoring.participants.properties.IPropertyEvaluator#test(java.lang.Object, java.lang.String, java.lang.String)
+ */
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+ if (!(receiver instanceof IAdaptable)) {
+ final String elementName = (receiver == null ? "null" : //$NON-NLS-1$
+ receiver.getClass().getName());
+ throw new IllegalArgumentException(
+ String.format("Element must be of type IAdaptable, is %s", //$NON-NLS-1$
+ elementName));
+ }
+
+ IJavaElement element;
+ if (receiver instanceof IJavaElement) {
+ element = (IJavaElement) receiver;
+ } else if (receiver instanceof IResource) {
+ element = JavaCore.create((IResource) receiver);
+ if (element == null) {
+ return false;
+ }
+ } else { // is IAdaptable
+ element= (IJavaElement) ((IAdaptable) receiver).getAdapter(IJavaElement.class);
+ if (element == null) {
+ IResource resource = (IResource) ((IAdaptable) receiver).getAdapter(
+ IResource.class);
+ element = JavaCore.create(resource);
+ if (element == null) {
+ return false;
+ }
+ }
+ }
+ if (PROPERTY_IS_TEST.equals(property)) {
+ return isJUnitTest(element);
+ } else if (PROPERTY_CAN_LAUNCH_AS_JUNIT_TEST.equals(property)) {
+ return canLaunchAsJUnitTest(element);
+ }
+ throw new IllegalArgumentException(
+ String.format("Unknown test property '%s'", property)); //$NON-NLS-1$
+ }
+
+ private boolean canLaunchAsJUnitTest(IJavaElement element) {
+ try {
+ switch (element.getElementType()) {
+ case IJavaElement.JAVA_PROJECT:
+ return true; // can run, let JDT detect if there are tests
+ case IJavaElement.PACKAGE_FRAGMENT_ROOT:
+ return false; // not supported by Android test runner
+ case IJavaElement.PACKAGE_FRAGMENT:
+ return ((IPackageFragment) element).hasChildren();
+ case IJavaElement.COMPILATION_UNIT:
+ case IJavaElement.CLASS_FILE:
+ case IJavaElement.TYPE:
+ case IJavaElement.METHOD:
+ return isJUnitTest(element);
+ default:
+ return false;
+ }
+ } catch (JavaModelException e) {
+ return false;
+ }
+ }
+
+ /**
+ * Return whether the target resource is a JUnit test.
+ */
+ private boolean isJUnitTest(IJavaElement element) {
+ try {
+ IType testType = null;
+ if (element instanceof ICompilationUnit) {
+ testType = (((ICompilationUnit) element)).findPrimaryType();
+ } else if (element instanceof IClassFile) {
+ testType = (((IClassFile) element)).getType();
+ } else if (element instanceof IType) {
+ testType = (IType) element;
+ } else if (element instanceof IMember) {
+ testType = ((IMember) element).getDeclaringType();
+ }
+ if (testType != null && testType.exists()) {
+ return TestSearchEngine.isTestOrTestSuite(testType);
+ }
+ } catch (CoreException e) {
+ // ignore, return false
+ }
+ return false;
+ }
+}
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/AndroidJUnitLaunchInfo.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/AndroidJUnitLaunchInfo.java
index 89cad97ae..8ac80cab5 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/AndroidJUnitLaunchInfo.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/AndroidJUnitLaunchInfo.java
@@ -15,35 +15,38 @@
*/
package com.android.ide.eclipse.adt.launch.junit.runtime;
-import org.eclipse.core.resources.IProject;
-
import com.android.ddmlib.IDevice;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.debug.core.ILaunch;
+
/**
* Contains info about Android JUnit launch
*/
public class AndroidJUnitLaunchInfo {
private final IProject mProject;
- private final String mTestPackage;
+ private final String mAppPackage;
private final String mRunner;
- private final boolean mDebugMode;
- private final IDevice mDevice;
-
- public AndroidJUnitLaunchInfo(IProject project, String testPackage, String runner,
- boolean debugMode, IDevice device) {
+
+ private boolean mDebugMode = false;
+ private IDevice mDevice = null;
+ private String mTestPackage = null;
+ private String mTestClass = null;
+ private String mTestMethod = null;
+ private ILaunch mLaunch = null;
+
+ public AndroidJUnitLaunchInfo(IProject project, String appPackage, String runner) {
mProject = project;
- mTestPackage = testPackage;
+ mAppPackage = appPackage;
mRunner = runner;
- mDebugMode = debugMode;
- mDevice = device;
}
-
+
public IProject getProject() {
return mProject;
}
- public String getTestPackage() {
- return mTestPackage;
+ public String getAppPackage() {
+ return mAppPackage;
}
public String getRunner() {
@@ -53,8 +56,80 @@ public class AndroidJUnitLaunchInfo {
public boolean isDebugMode() {
return mDebugMode;
}
+
+ public void setDebugMode(boolean debugMode) {
+ mDebugMode = debugMode;
+ }
public IDevice getDevice() {
return mDevice;
}
+
+ public void setDevice(IDevice device) {
+ mDevice = device;
+ }
+
+ /**
+ * Specify to run all tests within given package.
+ *
+ * @param testPackage fully qualified java package
+ */
+ public void setTestPackage(String testPackage) {
+ mTestPackage = testPackage;
+ }
+
+ /**
+ * Return the package of tests to run.
+ *
+ * @return fully qualified java package. null if not specified.
+ */
+ public String getTestPackage() {
+ return mTestPackage;
+ }
+
+ /**
+ * Sets the test class to run.
+ *
+ * @param testClass fully qualfied test class to run
+ * Expected format: x.y.x.testclass
+ */
+ public void setTestClass(String testClass) {
+ mTestClass = testClass;
+ }
+
+ /**
+ * Returns the test class to run.
+ *
+ * @return fully qualfied test class to run.
+ * null if not specified.
+ */
+ public String getTestClass() {
+ return mTestClass;
+ }
+
+ /**
+ * Sets the test method to run. testClass must also be set.
+ *
+ * @param testMethod test method to run
+ */
+ public void setTestMethod(String testMethod) {
+ mTestMethod = testMethod;
+ }
+
+ /**
+ * Returns the test method to run.
+ *
+ * @return test method to run. null if not specified.
+ */
+ public String getTestMethod() {
+ return mTestMethod;
+ }
+
+ public ILaunch getLaunch() {
+ return mLaunch;
+ }
+
+ public void setLaunch(ILaunch launch) {
+ mLaunch = launch;
+ }
}
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
index 0a6a3daee..962d76133 100755
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
@@ -69,8 +69,9 @@ public class RemoteAdtTestRunner extends RemoteTestRunner {
* executing the tests, and send it back to JDT JUnit. The second is the actual test execution,
* whose results will be communicated back in real-time to JDT JUnit.
*
- * @param testClassNames array of fully qualified test class names to execute. Cannot be empty.
- * @param testName test to execute. If null, will be ignored.
+ * @param testClassNames ignored - the AndroidJUnitLaunchInfo will be used to determine which
+ * tests to run.
+ * @param testName ignored
* @param execution used to report test progress
*/
@Override
@@ -78,16 +79,21 @@ public class RemoteAdtTestRunner extends RemoteTestRunner {
// hold onto this execution reference so it can be used to report test progress
mExecution = execution;
- RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(mLaunchInfo.getTestPackage(),
+ RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(mLaunchInfo.getAppPackage(),
mLaunchInfo.getRunner(), mLaunchInfo.getDevice());
- if (testClassNames != null && testClassNames.length > 0) {
- if (testName != null) {
- runner.setMethodName(testClassNames[0], testName);
- } else {
- runner.setClassNames(testClassNames);
- }
+ if (mLaunchInfo.getTestClass() != null) {
+ if (mLaunchInfo.getTestMethod() != null) {
+ runner.setMethodName(mLaunchInfo.getTestClass(), mLaunchInfo.getTestMethod());
+ } else {
+ runner.setClassName(mLaunchInfo.getTestClass());
+ }
}
+
+ if (mLaunchInfo.getTestPackage() != null) {
+ runner.setTestPackageName(mLaunchInfo.getTestPackage());
+ }
+
// set log only to first collect test case info, so Eclipse has correct test case count/
// tree info
runner.setLogOnly(true);
From 8a2dece67d273e16565bee8d8d952bde0ea5b982 Mon Sep 17 00:00:00 2001
From: Raphael Moll <>
Date: Wed, 1 Apr 2009 12:29:32 -0700
Subject: [PATCH 18/45] AI 144048: ADT #1743364: Uncomment the system resource
chooser code. Rationale: we want to keep that code around, so we need to
compile it to make sure it doesn't use obsoleted APIs. That does it.
BUG=1743364
Automated import of CL 144048
---
.../ide/eclipse/adt/ui/ResourceChooser.java | 63 ++++++++++---------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java
index 4290f6b79..26396116c 100644
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java
@@ -20,6 +20,10 @@ import com.android.ide.eclipse.common.resources.IResourceRepository;
import com.android.ide.eclipse.common.resources.ResourceItem;
import com.android.ide.eclipse.common.resources.ResourceType;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
@@ -39,11 +43,11 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
private IResourceRepository mProjectResources;
- // TODO: enable when we can display the system resources.
- // private Pattern mSystemResourcePattern;
- // private IResourceRepository mSystemResources;
- // private Button mProjectButton;
- // private Button mSystemButton;
+ private final static boolean SHOW_SYSTEM_RESOURCE = false; // TODO re-enable at some point
+ private Pattern mSystemResourcePattern;
+ private IResourceRepository mSystemResources;
+ private Button mProjectButton;
+ private Button mSystemButton;
private String mCurrentResource;
@@ -60,14 +64,15 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
mResourceType = type;
mProjectResources = project;
- // TODO: enable when we can display the system resources.
- // mSystemResources = system;
mProjectResourcePattern = Pattern.compile(
"@" + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ //$NON-NLS-2$
- // TODO: enable when we can display the system resources.
- // mSystemResourcePattern = Pattern.compile(
- // "@android:" + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ if (SHOW_SYSTEM_RESOURCE) {
+ mSystemResources = system;
+ mSystemResourcePattern = Pattern.compile(
+ "@android:" + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
setTitle("Resource Chooser");
setMessage(String.format("Choose a %1$s resource",
@@ -89,8 +94,7 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
ResourceItem item = (ResourceItem)elements[0];
mCurrentResource = mResourceType.getXmlString(item,
- // TODO: enable when we can display the system resources.
- false /*mSystemButton.getSelection()*/);
+ SHOW_SYSTEM_RESOURCE && mSystemButton.getSelection());
}
}
@@ -100,9 +104,7 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
createMessageArea(top);
- // TODO: enable when we can display the system resources.
- // createButtons(top);
-
+ createButtons(top);
createFilterText(top);
createFilteredList(top);
@@ -115,8 +117,10 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
* Creates the radio button to switch between project and system resources.
* @param top the parent composite
*/
- /* TODO: enable when we can display the system resources.
private void createButtons(Composite top) {
+ if (!SHOW_SYSTEM_RESOURCE) {
+ return;
+ }
mProjectButton = new Button(top, SWT.RADIO);
mProjectButton.setText("Project Resources");
mProjectButton.addSelectionListener(new SelectionAdapter() {
@@ -136,7 +140,6 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
}
});
}
- */
/**
* Setups the current list based on the current resource.
@@ -147,20 +150,22 @@ public class ResourceChooser extends AbstractElementListSelectionDialog {
ResourceItem[] items = mProjectResources.getResources(mResourceType);
setListElements(items);
}
- /*
- * TODO: enable when we can display the system resources.
- if (setupInitialSelection(mProjectResourcePattern, mProjectResources) == false) {
- if (setupInitialSelection(mSystemResourcePattern, mSystemResources) == false) {
- // if we couldn't understand the current value, we default to the project resources
- IResourceItem[] items = mProjectResources.getResources(mResourceType);
- setListElements(items);
- mProjectButton.setSelection(true);
+
+ if (SHOW_SYSTEM_RESOURCE) {
+ if (setupInitialSelection(mProjectResourcePattern, mProjectResources) == false) {
+ if (setupInitialSelection(mSystemResourcePattern, mSystemResources) == false) {
+ // if we couldn't understand the current value,
+ // we default to the project resources
+ ResourceItem[] items = mProjectResources.getResources(mResourceType);
+ setListElements(items);
+ mProjectButton.setSelection(true);
+ } else {
+ mSystemButton.setSelection(true);
+ }
} else {
- mSystemButton.setSelection(true);
+ mProjectButton.setSelection(true);
}
- } else {
- mProjectButton.setSelection(true);
- }*/
+ }
}
/**
From dfa5494492fbab008a932a116cc74553e27ab941 Mon Sep 17 00:00:00 2001
From: Mike Ritter <>
Date: Wed, 1 Apr 2009 17:30:12 -0700
Subject: [PATCH 19/45] AI 144164: Adding droiddocs/javadocs usage to Pdk-docs
to get correct style. BUG=1646802
Automated import of CL 144164
---
pdk/Pdk.mk | 72 +++-
pdk/README | 106 +++--
pdk/docs/audio_sub_system.html | 261 ------------
pdk/docs/audio_sub_system.jd | 56 +++
pdk/docs/bluetooth.html | 276 -------------
pdk/docs/bluetooth.jd | 82 ++++
pdk/docs/{bring_up.html => bring_up.jd} | 207 +---------
pdk/docs/build_new_device.html | 333 ---------------
pdk/docs/build_new_device.jd | 130 ++++++
.../{build_system.html => build_system.jd} | 210 +---------
pdk/docs/camera.html | 280 -------------
pdk/docs/camera.jd | 87 ++++
...isplay_drivers.html => display_drivers.jd} | 210 +---------
pdk/docs/getting_source_code.html | 335 ----------------
pdk/docs/getting_source_code.jd | 126 ++++++
pdk/docs/gps.html | 259 ------------
pdk/docs/gps.jd | 49 +++
.../{group__memory.html => group__memory.jd} | 25 +-
...__networking.html => group__networking.jd} | 26 +-
pdk/docs/index.html | 248 ------------
pdk/docs/index.jd | 39 ++
...work.html => instrumentation_framework.jd} | 181 +--------
...esting.html => instrumentation_testing.jd} | 211 +---------
pdk/docs/intro_source_code.html | 378 ------------------
pdk/docs/intro_source_code.jd | 169 ++++++++
...d_input.html => keymaps_keyboard_input.jd} | 210 +---------
pdk/docs/power_management.html | 311 --------------
pdk/docs/power_management.jd | 108 +++++
pdk/docs/source_setup_guide.html | 323 ---------------
pdk/docs/source_setup_guide.jd | 116 ++++++
pdk/docs/system_requirements.html | 262 ------------
pdk/docs/system_requirements.jd | 63 +++
pdk/docs/{telephony.html => telephony.jd} | 211 +---------
pdk/docs/wifi.html | 250 ------------
pdk/docs/wifi.jd | 49 +++
pdk/hosting/app.yaml | 4 +-
pdk/hosting/pdk.py | 18 +-
37 files changed, 1238 insertions(+), 5043 deletions(-)
delete mode 100755 pdk/docs/audio_sub_system.html
create mode 100755 pdk/docs/audio_sub_system.jd
delete mode 100755 pdk/docs/bluetooth.html
create mode 100755 pdk/docs/bluetooth.jd
rename pdk/docs/{bring_up.html => bring_up.jd} (66%)
delete mode 100755 pdk/docs/build_new_device.html
create mode 100755 pdk/docs/build_new_device.jd
rename pdk/docs/{build_system.html => build_system.jd} (62%)
delete mode 100755 pdk/docs/camera.html
create mode 100755 pdk/docs/camera.jd
rename pdk/docs/{display_drivers.html => display_drivers.jd} (61%)
delete mode 100755 pdk/docs/getting_source_code.html
create mode 100755 pdk/docs/getting_source_code.jd
delete mode 100755 pdk/docs/gps.html
create mode 100755 pdk/docs/gps.jd
rename pdk/docs/{group__memory.html => group__memory.jd} (54%)
rename pdk/docs/{group__networking.html => group__networking.jd} (57%)
delete mode 100755 pdk/docs/index.html
create mode 100644 pdk/docs/index.jd
rename pdk/docs/{instrumentation_framework.html => instrumentation_framework.jd} (50%)
rename pdk/docs/{instrumentation_testing.html => instrumentation_testing.jd} (77%)
delete mode 100755 pdk/docs/intro_source_code.html
create mode 100755 pdk/docs/intro_source_code.jd
rename pdk/docs/{keymaps_keyboard_input.html => keymaps_keyboard_input.jd} (71%)
delete mode 100755 pdk/docs/power_management.html
create mode 100755 pdk/docs/power_management.jd
delete mode 100755 pdk/docs/source_setup_guide.html
create mode 100755 pdk/docs/source_setup_guide.jd
delete mode 100755 pdk/docs/system_requirements.html
create mode 100755 pdk/docs/system_requirements.jd
rename pdk/docs/{telephony.html => telephony.jd} (61%)
delete mode 100755 pdk/docs/wifi.html
create mode 100755 pdk/docs/wifi.jd
diff --git a/pdk/Pdk.mk b/pdk/Pdk.mk
index abe9491d2..fbe8b5c90 100644
--- a/pdk/Pdk.mk
+++ b/pdk/Pdk.mk
@@ -16,7 +16,7 @@
# Assemble the Platform Development Kit (PDK)
# (TODO) Figure out why $(ACP) builds with target ndk but not pdk_docs
-# (TODO) Build doxygen (depend on latest version)
+# (TODO) Build doxygen (depend on latest version) -> line 25 error
pdk:
@echo "Package: $@ has targets ndk, pdk_docs and pdk_all"
@@ -38,6 +38,8 @@ include $(LOCAL_PATH)/ndk/Ndk.mk
# Doxygenize the header files to create html docs in the generatedDocs dir.
# Copy the appengine files, the template files and the generated html
# to the docs dir and zip everything up to the distribution directory.
+# Run javadocs/droiddocs/clearsilver on the generatedDocs dir to get the right
+# styles added to the html.
# Workspace directory
@@ -149,13 +151,27 @@ $(pdk_docs_intermediates)/pdk.py: $(pdk_hosting_dir)/pdk.py
@echo "PDK: $@"
$(copy-file-to-target-with-cp)
+# Copy appengine server files for new system
+$(OUT_DOCS)/app.yaml: $(pdk_hosting_dir)/app.yaml
+ @echo "PDK: $@"
+ $(copy-file-to-target-with-cp)
+
+$(OUT_DOCS)/pdk.py: $(pdk_hosting_dir)/pdk.py
+ @echo "PDK: $@"
+ $(copy-file-to-target-with-cp)
+
+# All the files that we depend upon
+all_pdk_docs_files := $(pdk_doxygen_config_override_file) \
+ $(pdk_doxygen_config_file) $(pdk_docs_intermediates)/header.html \
+ $(pdk_docs_intermediates)/footer.html $(pdk_doxy_docsfiles_dir)/groups.dox \
+ $(pdk_doxy_docsfiles_dir)/main.dox all_copied_pdk_templates
# Run doxygen and copy all output and templates to the final destination
# We replace index.html with a template file so don't use the generated one
pdk_doxygen: all_copied_pdk_headers $(pdk_doxygen_config_override_file) \
$(pdk_doxygen_config_file) $(pdk_docs_intermediates)/header.html \
$(pdk_docs_intermediates)/footer.html $(pdk_doxy_docsfiles_dir)/groups.dox \
- $(pdk_doxy_docsfiles_dir)/main.dox
+ $(pdk_doxy_docsfiles_dir)/main.dox
@echo "Files for Doxygination: $^"
@mkdir -p $(pdk_generated_source_dir)
@rm -f $(pdk_generated_source_dir)/*
@@ -164,7 +180,40 @@ pdk_doxygen: all_copied_pdk_headers $(pdk_doxygen_config_override_file) \
@cd $(pdk_generated_source_dir) && chmod ug+rx *
@rm -f $(pdk_generated_source_dir)/index.html
@cp -fp $(pdk_generated_source_dir)/* $(pdk_docs_dest_dir)
-
+
+
+# ==== docs for the web (on the google app engine server) =======================
+# Run javadoc/droiddoc/clearsilver to get the formatting right
+
+# make droiddocs run after we make our doxygen docs
+$(pdk_docs_intermediates)/pdk-timestamp: pdk_doxygen
+ @touch $(pdk_docs_intermediates)/pdk-timestamp
+
+$(LOCAL_PATH)/pdk-timestamp: $(pdk_docs_intermediates)/pdk-timestamp
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := pdk-timestamp samples/samplejni/src/com/example/jniexample/JNIExample.java
+LOCAL_MODULE_CLASS := development/pdk/ndk/samples/samplejni/src/com/example/jniexample
+LOCAL_DROIDDOC_SOURCE_PATH := $(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
+LOCAL_DROIDDOC_HTML_DIR := ../../../$(pdk_docs_dest_dir)
+
+LOCAL_MODULE := online-pdk
+
+LOCAL_DROIDDOC_OPTIONS := \
+ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
+ $(web_docs_sample_code_flags) \
+ -toroot /online-pdk/ \
+ -hdf android.whichdoc online-pdk
+
+LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := build/tools/droiddoc/templates-pdk
+LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets-pdk
+
+include $(BUILD_DROIDDOC)
+
+# The docs output dir is: out/target/common/docs/online-pdk
+DOCS_OUT_DIR := $(OUT_DOCS)/$(LOCAL_MODULE)
+
# Name the tar files
name := android_pdk_docs-$(REQUESTED_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -173,21 +222,25 @@ endif
name := $(name)-$(BUILD_NUMBER)
pdk_docs_tarfile := $(pdk_docs_intermediates)/$(name).tar
pdk_docs_tarfile_zipped := $(pdk_docs_tarfile).gz
+new_pdk_docs_tarfile := $(pdk_docs_intermediates)/new-$(name).tar
+new_pdk_docs_tarfile_zipped := $(new_pdk_docs_tarfile).gz
-.PHONY: pdk pdk_docs pdk_doxygen all_copied_pdk_headers all_copied_pdk_templates
+.PHONY: pdk pdk_docs pdk_doxygen all_copied_pdk_headers all_copied_pdk_templates pdk-timestamp
-pdk_docs: $(pdk_docs_tarfile_zipped)
+pdk_docs: $(pdk_docs_tarfile_zipped) $(new_pdk_docs_tarfile)
@echo "PDK: Docs tarred and zipped"
# Put the pdk_docs zip files in the distribution directory
$(call dist-for-goals,pdk_docs,$(pdk_docs_tarfile_zipped))
+$(call dist-for-goals,pdk_docs,$(new_pdk_docs_tarfile_zipped))
# zip up tar files
%.tar.gz: %.tar
- @echo "PDK: zipped $<"
+ @echo "PDK docs: zipped $<"
$(hide) gzip -cf $< > $@
# tar up all the files to make the pdk docs.
+# old version
$(pdk_docs_tarfile): pdk_doxygen all_copied_pdk_templates \
$(pdk_docs_intermediates)/pdk.py $(pdk_docs_intermediates)/app.yaml
@echo "PDK: $@"
@@ -195,6 +248,13 @@ $(pdk_docs_tarfile): pdk_doxygen all_copied_pdk_templates \
@rm -f $@
$(hide) tar rf $@ -C $(pdk_docs_intermediates) docs pdk.py app.yaml
+# new version
+$(new_pdk_docs_tarfile): $(DOCS_OUT_DIR)-timestamp
+ @echo "PDK docs: $@"
+ @mkdir -p $(dir $@)
+ @rm -f $@
+ $(hide) tar rf $@ -C $(OUT_DOCS) $(LOCAL_MODULE)
+
# Debugging reporting can go here, add it as a target to get output.
pdk_debug:
@echo "You are here: $@"
diff --git a/pdk/README b/pdk/README
index 86621552e..18ff5d120 100644
--- a/pdk/README
+++ b/pdk/README
@@ -4,78 +4,72 @@ Building the pdk (platform development kit)
(We currently support version 1.4.6)
sudo apt-get install doxygen
+
+Make sure that you are using the right version of java
+
+ sudo update-java-alternatives -s java-1.5.0-sun
+
+If that doesn't work, go through the instructions on
+
+ http://source.android.com/download again.
+
2) from the root
. build/envsetup.sh
-3) run choosecombo
- Build for the simulator or the device?
- 1. Device
- 2. Simulator
-
- Which would you like? [1] 1
-
-
- Build type choices are:
- 1. release
- 2. debug
-
- Which would you like? [1] 1
-
-
- Product choices are:
- 0. emulator
- 1. generic
- 2. sim
- 3. surf
- You can also type the name of a product if you know it.
- Which would you like? [generic] 1
-
-
- Variant choices are:
- 1. user
- 2. userdebug
- 3. eng
- Which would you like? [eng] 3
-
- ============================================
- TARGET_PRODUCT=generic
- TARGET_BUILD_VARIANT=eng
- TARGET_SIMULATOR=false
- TARGET_BUILD_TYPE=release
- TARGET_ARCH=arm
- HOST_ARCH=x86
- HOST_OS=linux
- HOST_BUILD_TYPE=release
- BUILD_ID=
- ============================================
4) mkdir dist
mkdir logs
- mkpdkcupcake.sh
+
+then build everything:
-(which contains:
+ time make -j4 pdk pdk_all dist DIST_DIR=dist 2>&1 | tee logs/`date +%y%m%d-%H%M%S`
-DT=`date +%y%m%d-%H%M%S`
-time make -j4 pdk pdk_all dist DIST_DIR=dist 2>&1 | tee logs/$DT
+so you can have a record of the build commands in the logs directory.
-so you can see the results of the build in the logs directory.)
5) the pdk tar file is put in the dist directory.
+6) the pdk-docs are in
+
+ out/target
+
The build target 'pdk' brings in the pdk/ndk make files into the build system.
- Then there are three targets:
- pdk_docs - which builds the pdk documentation
- ndk - which builds the native development kit (native compiler, linker, etc.)
- pdk_all - which builds the above two targets
+ Then there are three targets:
+ pdk_docs - which builds just the pdk documentation
+ ndk - which builds the native development kit (native compiler, linker, etc.)
+ pdk_all - which builds the above two targets
-for doxygen version changing you can pass in the variable:
-doxygen_version='
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -AudioHardwareInterface serves as the glue between proprietary audio drivers and the Android AudioFlinger service, the core audio service that handles all audio-related requests from applications.
-
Building an Audio Library
- -To implement an audio driver, create a shared library that implements the interface defined in AudioHardwareInterface.h. You must name your shared library libaudio.so so that it will get loaded from /system/lib at runtime. Place libaudio sources and Android.mk in partner/acme/chipset_or_board/libaudio/.
The following stub Android.mk file ensures that libaudio compiles and links to the appropriate libraries:
-LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libaudio - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libutils \ - libmedia \ - libhardware - -LOCAL_SRC_FILES += MyAudioHardware.cpp - -LOCAL_CFLAGS += - -LOCAL_C_INCLUDES += - -LOCAL_STATIC_LIBRARIES += libaudiointerface - -include $(BUILD_SHARED_LIBRARY) -- - -
Interface
- - - -Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
- - - - - - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/audio_sub_system.jd b/pdk/docs/audio_sub_system.jd
new file mode 100755
index 000000000..903032fad
--- /dev/null
+++ b/pdk/docs/audio_sub_system.jd
@@ -0,0 +1,56 @@
+page.title=Audio
+pdk.version=1.0
+@jd:body
+
+
+
+
+Introduction
+ +AudioHardwareInterface serves as the glue between proprietary audio drivers and the Android AudioFlinger service, the core audio service that handles all audio-related requests from applications.
+
Building an Audio Library
+ +To implement an audio driver, create a shared library that implements the interface defined in AudioHardwareInterface.h. You must name your shared library libaudio.so so that it will get loaded from /system/lib at runtime. Place libaudio sources and Android.mk in partner/acme/chipset_or_board/libaudio/.
The following stub Android.mk file ensures that libaudio compiles and links to the appropriate libraries:
+LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libaudio + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + libmedia \ + libhardware + +LOCAL_SRC_FILES += MyAudioHardware.cpp + +LOCAL_CFLAGS += + +LOCAL_C_INCLUDES += + +LOCAL_STATIC_LIBRARIES += libaudiointerface + +include $(BUILD_SHARED_LIBRARY) ++ + +
Interface
+ + + +Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
+ + + diff --git a/pdk/docs/bluetooth.html b/pdk/docs/bluetooth.html deleted file mode 100755 index edd3c260d..000000000 --- a/pdk/docs/bluetooth.html +++ /dev/null @@ -1,276 +0,0 @@ - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -Android's Bluetooth stack uses BlueZ version 3.36 for GAP, SDP, and RFCOMM profiles, and is a SIG-qualified Bluetooth 2.0 host stack.
- -Bluez is GPL licensed, so the Android framework interacts with userspace bluez code through D-BUS IPC to avoid proprietary code.
- -Headset and Handsfree (v1.5) profiles are implemented in the Android framework and are both tightly coupled with the Phone App. These profiles are also SIG qualified.
- -The diagram below offers a library-oriented view of the Bluetooth stack. Click Bluetooth Process Diagram for a process-oriented view.
- -
Porting
- -BlueZ is Bluetooth 2.0 compatible and should work with any 2.0 chipset. There are two integration points:
--
-
- UART driver -
- Bluetooth Power On / Off -
UART Driver
- -The BlueZ kernel sub-system attaches to your hardware-specific UART driver using the hciattach daemon.
For example, for MSM7201A, this is drivers/serial/msm_serial.c. You may also need to edit command line options to hciattach via init.rc.
Bluetooth Power On / Off
- -The method for powering on and off your bluetooth chip varies from Android V 1.0 to post 1.0.
- --
-
- 1.0: Android framework writes a 0 or 1 to
/sys/modules/board_[PLATFORM]/parameters/bluetooth_power_on.
-
- - Post 1.0: Android framework uses the linux
rfkillAPI. Seearch/arm/mach-msm/board-trout-rfkill.cfor an example.
-
Tools
- -BlueZ provides a rich set of command line tools for debugging and interacting with the Bluetooth sub-system, including:
--
-
hciconfig
-hcitool
-hcidump
-sdptool
-dbus-send
-dbus-monitor
-
v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/bluetooth.jd b/pdk/docs/bluetooth.jd
new file mode 100755
index 000000000..a21ad7dea
--- /dev/null
+++ b/pdk/docs/bluetooth.jd
@@ -0,0 +1,82 @@
+page.title=Bluetooth
+@jd:body
+
+
+
+
+
+Introduction
+ +Android's Bluetooth stack uses BlueZ version 3.36 for GAP, SDP, and RFCOMM profiles, and is a SIG-qualified Bluetooth 2.0 host stack.
+ +Bluez is GPL licensed, so the Android framework interacts with userspace bluez code through D-BUS IPC to avoid proprietary code.
+ +Headset and Handsfree (v1.5) profiles are implemented in the Android framework and are both tightly coupled with the Phone App. These profiles are also SIG qualified.
+ +The diagram below offers a library-oriented view of the Bluetooth stack. Click Bluetooth Process Diagram for a process-oriented view.
+ +
Porting
+ +BlueZ is Bluetooth 2.0 compatible and should work with any 2.0 chipset. There are two integration points:
+-
+
- UART driver +
- Bluetooth Power On / Off +
UART Driver
+ +The BlueZ kernel sub-system attaches to your hardware-specific UART driver using the hciattach daemon.
For example, for MSM7201A, this is drivers/serial/msm_serial.c. You may also need to edit command line options to hciattach via init.rc.
Bluetooth Power On / Off
+ +The method for powering on and off your bluetooth chip varies from Android V 1.0 to post 1.0.
+ +-
+
- 1.0: Android framework writes a 0 or 1 to
/sys/modules/board_[PLATFORM]/parameters/bluetooth_power_on.
+
+ - Post 1.0: Android framework uses the linux
rfkillAPI. Seearch/arm/mach-msm/board-trout-rfkill.cfor an example.
+
Tools
+ +BlueZ provides a rich set of command line tools for debugging and interacting with the Bluetooth sub-system, including:
+-
+
hciconfig
+hcitool
+hcidump
+sdptool
+dbus-send
+dbus-monitor
+
-
-
-
-
-
diff --git a/pdk/docs/build_new_device.html b/pdk/docs/build_new_device.html
deleted file mode 100755
index cbf9ed7a5..000000000
--- a/pdk/docs/build_new_device.html
+++ /dev/null
@@ -1,333 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
-
-
-
- Bring Up
+page.title=Bring Up +@jd:bodyOnce your code is built and you have verified that all necessary directories exist, power on and test your device with basic bring up, as described below. Bring up tests are typically designed to stress certain aspects of your system and allow you to characterize the device's behavior.
1. Confirm a Clean Installation of a Basic Linux Kernel
Before considering Android-specific modifications to the Linux kernel, verify that you can build, deploy, and boot a core Linux kernel on your target hardware.
+
2. Modify Your Kernel Configuration to Accommodate Android Drivers
Your kernel configuration file should include the following:
@@ -530,32 +358,3 @@ service akmd /sbin/akmd-
v0.6 - 25 November 2008
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Detailed Instructions
- -The directions below describe how to configure make files for new mobile devices and products.
--
-
- Create a company directory in
//device/partner.
-- mkdir device/partner/<company_name>
- - Create a
productsdirectory beneath the company directory you created in step 1.
-- mkdir device/partner/<company_name>/products/
- - Create a product-specific make file, called
device/partner/<company_name>/products/<first_product_name>.mk, that includes the following code:
-- $(call inherit-product, target/product/generic.mk) - # - # Overrides - PRODUCT_NAME := <first_product_name> - PRODUCT_DEVICE := <board_name>
- - In the
productsdirectory, create anAndroidProducts.mkfile that point to (and is responsible for finding) the individual product make files.
-- # - # This file should set PRODUCT_MAKEFILES to a list of product makefiles - # to expose to the build system. LOCAL_DIR will already be set to - # the directory containing this file. - # - # This file may not rely on the value of any variable other than - # LOCAL_DIR; do not use any conditionals, and do not look up the - # value of any variable that isn't set in this file or in a file that - # it includes. - # - - PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/first_product_name.mk \
- - Create a board-specific directory beneath your company directory that matches the
PRODUCT_DEVICEvariable<board_name>referenced in the product-specific make file above. This will include a make file that gets accessed by any product using this board.
-- mkdir device/partner/<company_name>/<board_name>
- - Create a
product_config.mkfile in the directory created in the previous step (device/partner/<company_name>/<board_name>). If this directory does not include aproduct_config.mkfile, the build will fail.
-- # These definitions override the defaults in config/config.make for <board_name> - # - # TARGET_NO_BOOTLOADER := false - # TARGET_HARDWARE_3D := false - # - TARGET_USE_GENERIC_AUDIO := true
- - If you wish to modify system properties, create a
system.propfile in your<board_name>directory(device/partner/<company_name>/<board_name>).
-- # system.prop for
- # This overrides settings in the products/generic/system.prop file - # - # rild.libpath=/system/lib/libreference-ril.so - # rild.libargs=-d /dev/ttyS0
- - Add a pointer to
<second_product_name>.mkwithinproducts/AndroidProducts.mk.
-- PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/first_product_name.mk \ - $(LOCAL_DIR)/second_product_name.mk
- device/partner/<company_name>/<board_name>must include anAndroid.mkfile with at least the following code:
-- # make file for new hardware
from - # - LOCAL_PATH := $(call my-dir) - # - # this is here to use the pre-built kernel - ifeq ($(TARGET_PREBUILT_KERNEL),) - TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel - endif - # - file := $(INSTALLED_KERNEL_TARGET) - ALL_PREBUILT += $(file) - $(file): $(TARGET_PREBUILT_KERNEL) | $(ACP) - $(transform-prebuilt-to-target) - # - # no boot loader, so we don't need any of that stuff.. - # - LOCAL_PATH := partner/<company_name>/<board_name> - # - include $(CLEAR_VARS) - # - # include more board specific stuff here? Such as Audio parameters. - #
-- To create a second product for the same board, create a second product-specific make file called
device/partner/company_name/products/<second_product_name>.mkthat includes:
-- $(call inherit-product, partner/google/products/generic.mk) - # - # Overrides - PRODUCT_NAME := <second_product_name> - PRODUCT_DEVICE := <board_name>
-
By now, you should have two new products, called <first_product_name> and <second_product_name> associated with <company_name>. To verify that a product is properly configured (<first_product_name>, for example), execute the following:
-
- cd device - . ./envsetup.sh - partner_setup <first_product_name> - make PRODUCT-<first_product_name>-user --
You should find new build binaries located in device/out/target/product/<board_name>.
-
-
-
New Product File Tree
- -The file tree below illustrates what your own system should look like after completing the steps above.
--
-
-
<company_name>
- <board_name>
- Android.mk
- product_config.mk
- system.prop
- products
- AndroidProducts.mk
- <first_product_name>.mk
- <second_product_name>.mk
-
-
-
-
-
-
-
v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/build_new_device.jd b/pdk/docs/build_new_device.jd
new file mode 100755
index 000000000..f0a816f54
--- /dev/null
+++ b/pdk/docs/build_new_device.jd
@@ -0,0 +1,130 @@
+page.title=Building Android for a new Mobile Device
+pdk.version=1.0
+@jd:body
+
+
+
+
+
+
+Detailed Instructions
+ +The directions below describe how to configure make files for new mobile devices and products.
+-
+
- Create a company directory in
//device/partner.
++ mkdir device/partner/<company_name>
+ - Create a
productsdirectory beneath the company directory you created in step 1.
++ mkdir device/partner/<company_name>/products/
+ - Create a product-specific make file, called
device/partner/<company_name>/products/<first_product_name>.mk, that includes the following code:
++ $(call inherit-product, target/product/generic.mk) + # + # Overrides + PRODUCT_NAME := <first_product_name> + PRODUCT_DEVICE := <board_name>
+ - In the
productsdirectory, create anAndroidProducts.mkfile that point to (and is responsible for finding) the individual product make files.
++ # + # This file should set PRODUCT_MAKEFILES to a list of product makefiles + # to expose to the build system. LOCAL_DIR will already be set to + # the directory containing this file. + # + # This file may not rely on the value of any variable other than + # LOCAL_DIR; do not use any conditionals, and do not look up the + # value of any variable that isn't set in this file or in a file that + # it includes. + # + + PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/first_product_name.mk \
+ - Create a board-specific directory beneath your company directory that matches the
PRODUCT_DEVICEvariable<board_name>referenced in the product-specific make file above. This will include a make file that gets accessed by any product using this board.
++ mkdir device/partner/<company_name>/<board_name>
+ - Create a
product_config.mkfile in the directory created in the previous step (device/partner/<company_name>/<board_name>). If this directory does not include aproduct_config.mkfile, the build will fail.
++ # These definitions override the defaults in config/config.make for <board_name> + # + # TARGET_NO_BOOTLOADER := false + # TARGET_HARDWARE_3D := false + # + TARGET_USE_GENERIC_AUDIO := true
+ - If you wish to modify system properties, create a
system.propfile in your<board_name>directory(device/partner/<company_name>/<board_name>).
++ # system.prop for
+ # This overrides settings in the products/generic/system.prop file + # + # rild.libpath=/system/lib/libreference-ril.so + # rild.libargs=-d /dev/ttyS0
+ - Add a pointer to
<second_product_name>.mkwithinproducts/AndroidProducts.mk.
++ PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/first_product_name.mk \ + $(LOCAL_DIR)/second_product_name.mk
+ device/partner/<company_name>/<board_name>must include anAndroid.mkfile with at least the following code:
++ # make file for new hardware
from + # + LOCAL_PATH := $(call my-dir) + # + # this is here to use the pre-built kernel + ifeq ($(TARGET_PREBUILT_KERNEL),) + TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel + endif + # + file := $(INSTALLED_KERNEL_TARGET) + ALL_PREBUILT += $(file) + $(file): $(TARGET_PREBUILT_KERNEL) | $(ACP) + $(transform-prebuilt-to-target) + # + # no boot loader, so we don't need any of that stuff.. + # + LOCAL_PATH := partner/<company_name>/<board_name> + # + include $(CLEAR_VARS) + # + # include more board specific stuff here? Such as Audio parameters. + #
+- To create a second product for the same board, create a second product-specific make file called
device/partner/company_name/products/<second_product_name>.mkthat includes:
++ $(call inherit-product, partner/google/products/generic.mk) + # + # Overrides + PRODUCT_NAME := <second_product_name> + PRODUCT_DEVICE := <board_name>
+
By now, you should have two new products, called <first_product_name> and <second_product_name> associated with <company_name>. To verify that a product is properly configured (<first_product_name>, for example), execute the following:
+
+ cd device + . ./envsetup.sh + partner_setup <first_product_name> + make PRODUCT-<first_product_name>-user ++
You should find new build binaries located in device/out/target/product/<board_name>.
+
+
+
New Product File Tree
+ +The file tree below illustrates what your own system should look like after completing the steps above.
++
-
+
<company_name>
+ <board_name>
+ Android.mk
+ product_config.mk
+ system.prop
+ products
+ AndroidProducts.mk
+ <first_product_name>.mk
+ <second_product_name>.mk
+
-
+
-
+
-
+
-
-
-
-
-
diff --git a/pdk/docs/camera.html b/pdk/docs/camera.html
deleted file mode 100755
index 1b6565984..000000000
--- a/pdk/docs/camera.html
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
v0.6 - 25 November 2008
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
- Introduction
- -Android's camera subsystem connects the camera application to the application framework and user space libraries, which in turn communicate with the camera hardware layer that operates the physical camera.
-The diagram below illustrates the structure of the camera subsystem.
-
Building a Camera Library
- -To implement a camera driver, create a shared library that implements the interface defined in CameraHardwareInterface.h. You must name your shared library libcamera.so so that it will get loaded from /system/lib at runtime. Place libcamera sources and Android.mk in partner/acme/chipset_or_board/libcamera/.
The following stub Android.mk file ensures that libcamera compiles and links to the appropriate libraries:
-LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libcamera - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - librpc \ - liblog - -LOCAL_SRC_FILES += MyCameraHardware.cpp - -LOCAL_CFLAGS += - -LOCAL_C_INCLUDES += - -LOCAL_STATIC_LIBRARIES += \ - libcamera-common \ - libclock-rpc \ - libcommondefs-rpc - -include $(BUILD_SHARED_LIBRARY) -- - -
Sequence Diagrams
- - - -Preview
- -The following diagram illustrates the sequence of function calls and actions necessary for your camera to preview.
-
-
-
-Taking a Picture
- -The following diagram illustrates the sequence of function calls and actions necessary for your camera to take a picture.
-
-
-
-Interface
- - - -Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
- - - - - - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/camera.jd b/pdk/docs/camera.jd
new file mode 100755
index 000000000..85ed3dc4f
--- /dev/null
+++ b/pdk/docs/camera.jd
@@ -0,0 +1,87 @@
+page.title=Camera Subsystem
+@jd:body
+
+
+
+Introduction
+ +Android's camera subsystem connects the camera application to the application framework and user space libraries, which in turn communicate with the camera hardware layer that operates the physical camera.
+The diagram below illustrates the structure of the camera subsystem.
+
Building a Camera Library
+ +To implement a camera driver, create a shared library that implements the interface defined in CameraHardwareInterface.h. You must name your shared library libcamera.so so that it will get loaded from /system/lib at runtime. Place libcamera sources and Android.mk in partner/acme/chipset_or_board/libcamera/.
The following stub Android.mk file ensures that libcamera compiles and links to the appropriate libraries:
+LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libcamera + +LOCAL_SHARED_LIBRARIES := \ + libutils \ + librpc \ + liblog + +LOCAL_SRC_FILES += MyCameraHardware.cpp + +LOCAL_CFLAGS += + +LOCAL_C_INCLUDES += + +LOCAL_STATIC_LIBRARIES += \ + libcamera-common \ + libclock-rpc \ + libcommondefs-rpc + +include $(BUILD_SHARED_LIBRARY) ++ + +
Sequence Diagrams
+ + + +Preview
+ +The following diagram illustrates the sequence of function calls and actions necessary for your camera to preview.
+
+
+
+Taking a Picture
+ +The following diagram illustrates the sequence of function calls and actions necessary for your camera to take a picture.
+
+
+
+Interface
+ + + +Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
+ + + + + diff --git a/pdk/docs/display_drivers.html b/pdk/docs/display_drivers.jd similarity index 61% rename from pdk/docs/display_drivers.html rename to pdk/docs/display_drivers.jd index c20afe547..d1272079e 100755 --- a/pdk/docs/display_drivers.html +++ b/pdk/docs/display_drivers.jd @@ -1,187 +1,12 @@ - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
- Introduction
@@ -513,32 +338,3 @@ MODULE_LICENSE("GPL");Android relies on a double buffer to smoothly render page flips (please see Functionality for details). -
v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/getting_source_code.html b/pdk/docs/getting_source_code.html
deleted file mode 100755
index ad0cddbd4..000000000
--- a/pdk/docs/getting_source_code.html
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup - - -
- Basic Bring up - - - - -
- Multimedia
-
-
-
- Audio Subsystem -
- Camera -
- - Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
-
-
-
-
- Introduction
- -Android relies on Git, a version control system, to install the Android platform. You will need to install Git 1.5.2 or greater in order to access the source tree. Please visit http://git.or.cz/ for more information regarding Git.
-Git permits you to control access to working directories, and we recommend that you use it to limit Android repository access to only a few people within your organization (please refer to your Google NDA for potential contractual restraints on sharing Android source access).
-You may clone Google's repository to a local copy for sharing internally (see Git documentation for details).
- - -Installing and Configuring Git
- -To install the Git package, execute:
--% sudo apt-get install git-core -- - -
Establishing Server Access
- -Once Git is cleanly installed, you need to establish a connection with Google's Git server, a connection that requires an RSA key in order to authenticate requests.
- - -Generating RSA Keys
- -Each developer must have a unique RSA key in order to access Android source code. To generate an RSA key:
--
-
-
- Type:
-% ssh-keygen -t rsa -C email@domain.com
-You must use a valid email address to create your key.
- - When prompted, indicate the file to which you wish to write your key (
id_rsain this example).
- - When prompted, associate a passphrase with your key. -
- Upon success, you should have two files saved to the designated directory: -
id_rsa: This file contains the private half of your RSA key. You shouldn't share this file with anyone.
- id_rsa.pub: This is the public half or your RSA key and you should send it to your Google technical account manager.
-
-
-
Send your Google Account Manager your public key file in order to establish Git server access.
- - -Verifying a Connection to the Git Server
- -Once you have generated an RSA key and shared the public file with Google, you can test your connection with the Git server with the following command:
--% ssh android-git.ext.google.com -- -
You should receive one of the following results:
- -| Result | -Cause | -Action | -
|---|---|---|
-fatal: What do you think I am? A shell?
- |
- Success | -None. You successfully connected to the Git server. (You should not have shell access and it's expected to receive this error.) | -
| ssh hangs and eventually times out. | -Your setup is failing to locate and establish a basic connection. | -Google needs to debug network settings. | -
| Error: Permission denied <public key> | -Either you are not using the matching username or the RSA private key does not match the public key. | -Try executing: -
-% ssh $USER@android-
- git.ext.google.com
- |
-
Downloading Code
- -Android source code is maintained in two repositories: device and kernel. The device repository includes the Android framework (things like the Activity Manager, Window Manager, Telephony Manager, View System, etc.). The kernel repository includes the core code necessary to run the operating system (things like the Display Driver, Camera Driver, Keypad Driver, Power Management, etc.). (Please see What is Android? for details.)
Save device and kernel code at the same directory level, for example:
--
/home/joe/android/device
-/home/joe/android/kernel
-
Device Code
-To download device code, you need your username and a unique <path> string supplied by Google to execute the following:
-% git-clone $USER@android-git.ext.google.com:<path>/device.git -- -
Kernel Code
-To download kernel code, you need your username and a unique <path> string supplied by Google to execute the following:
-% git-clone $USER@android-git.ext.google.com:<path>/kernel.git -- - - -
Extracting an Android Patch
- -You likely already have Linux running on your platform and only need to integrate Android-specific changes. The following directions describe how to extract an Android patch.
--
-
- Download a generic version of the Linux kernel that matches the Linux version downloaded with the Android Kernel code. -
- Run
diffon the two kernel packages to get Android-specific changes.
- - Apply the patch to your target kernel and build. -
v0.5 - 25 September 2008
-
-
-
diff --git a/pdk/docs/getting_source_code.jd b/pdk/docs/getting_source_code.jd
new file mode 100755
index 000000000..19a7069ab
--- /dev/null
+++ b/pdk/docs/getting_source_code.jd
@@ -0,0 +1,126 @@
+page.title=Getting Source Code
+@jd:body
+
+
+
+Introduction
+Installing and Configuring Git
+Establishing Server Access
+Downloading Code
+Extracting an Android Patch
+
++Installing and Configuring Git
+Establishing Server Access
+Downloading Code
+Extracting an Android Patch
Introduction
+ +Android relies on Git, a version control system, to install the Android platform. You will need to install Git 1.5.2 or greater in order to access the source tree. Please visit http://git.or.cz/ for more information regarding Git.
+Git permits you to control access to working directories, and we recommend that you use it to limit Android repository access to only a few people within your organization (please refer to your Google NDA for potential contractual restraints on sharing Android source access).
+You may clone Google's repository to a local copy for sharing internally (see Git documentation for details).
+ + +Installing and Configuring Git
+ +To install the Git package, execute:
++% sudo apt-get install git-core ++ + +
Establishing Server Access
+ +Once Git is cleanly installed, you need to establish a connection with Google's Git server, a connection that requires an RSA key in order to authenticate requests.
+ + +Generating RSA Keys
+ +Each developer must have a unique RSA key in order to access Android source code. To generate an RSA key:
++
-
+
- Type:
+% ssh-keygen -t rsa -C email@domain.com
+You must use a valid email address to create your key.
+ - When prompted, indicate the file to which you wish to write your key (
id_rsain this example).
+ - When prompted, associate a passphrase with your key. +
- Upon success, you should have two files saved to the designated directory: +
id_rsa: This file contains the private half of your RSA key. You shouldn't share this file with anyone.
+ id_rsa.pub: This is the public half or your RSA key and you should send it to your Google technical account manager.
+
-
+
Send your Google Account Manager your public key file in order to establish Git server access.
+ + +Verifying a Connection to the Git Server
+ +Once you have generated an RSA key and shared the public file with Google, you can test your connection with the Git server with the following command:
++% ssh android-git.ext.google.com ++ +
You should receive one of the following results:
+ +| Result | +Cause | +Action | +
|---|---|---|
+fatal: What do you think I am? A shell?
+ |
+ Success | +None. You successfully connected to the Git server. (You should not have shell access and it's expected to receive this error.) | +
| ssh hangs and eventually times out. | +Your setup is failing to locate and establish a basic connection. | +Google needs to debug network settings. | +
| Error: Permission denied <public key> | +Either you are not using the matching username or the RSA private key does not match the public key. | +Try executing: +
+% ssh $USER@android-
+ git.ext.google.com
+ |
+
Downloading Code
+ +Android source code is maintained in two repositories: device and kernel. The device repository includes the Android framework (things like the Activity Manager, Window Manager, Telephony Manager, View System, etc.). The kernel repository includes the core code necessary to run the operating system (things like the Display Driver, Camera Driver, Keypad Driver, Power Management, etc.). (Please see What is Android? for details.)
Save device and kernel code at the same directory level, for example:
++
/home/joe/android/device
+/home/joe/android/kernel
+
Device Code
+To download device code, you need your username and a unique <path> string supplied by Google to execute the following:
+% git-clone $USER@android-git.ext.google.com:<path>/device.git ++ +
Kernel Code
+To download kernel code, you need your username and a unique <path> string supplied by Google to execute the following:
+% git-clone $USER@android-git.ext.google.com:<path>/kernel.git ++ + + +
Extracting an Android Patch
+ +You likely already have Linux running on your platform and only need to integrate Android-specific changes. The following directions describe how to extract an Android patch.
+-
+
- Download a generic version of the Linux kernel that matches the Linux version downloaded with the Android Kernel code. +
- Run
diffon the two kernel packages to get Android-specific changes.
+ - Apply the patch to your target kernel and build. +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -Android defines a user space C abstraction interface for GPS hardware. The interface header is defined in include/hardware/gps.h. In order to integate GPS with Android, you need to build a shared library that implements this interface.
Building a GPS Library
- -To implement a GPS driver, create a shared library that implements the interface defined in gps.h. You must name your shared library libgps.so so that it will get loaded from /system/lib at runtime. Place GPS sources and Android.mk in partner/acme/chipset_or_board/gps/ (where "acme" is your product name and "chipset_or_board" is your hardware target).
The following stub Android.mk file ensures that libgps compiles and links to the appropriate libraries:
-LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libgps - -LOCAL_STATIC_LIBRARIES:= \ -# include any static library dependencies - -LOCAL_SHARED_LIBRARIES := \ -# include any shared library dependencies - -LOCAL_SRC_FILES += \ -# include your source files. eg. MyGpsLibrary.cpp - -LOCAL_CFLAGS += \ -# include any needed compile flags - -LOCAL_C_INCLUDES:= \ -# include any needed local header files - -include $(BUILD_SHARED_LIBRARY) -- - -
Interface
- - - -Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
- - - - - - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/gps.jd b/pdk/docs/gps.jd
new file mode 100755
index 000000000..aa617e364
--- /dev/null
+++ b/pdk/docs/gps.jd
@@ -0,0 +1,49 @@
+page.title=GPS
+@jd:body
+
+
+
+
+Introduction
+ +Android defines a user space C abstraction interface for GPS hardware. The interface header is defined in include/hardware/gps.h. In order to integate GPS with Android, you need to build a shared library that implements this interface.
Building a GPS Library
+ +To implement a GPS driver, create a shared library that implements the interface defined in gps.h. You must name your shared library libgps.so so that it will get loaded from /system/lib at runtime. Place GPS sources and Android.mk in partner/acme/chipset_or_board/gps/ (where "acme" is your product name and "chipset_or_board" is your hardware target).
The following stub Android.mk file ensures that libgps compiles and links to the appropriate libraries:
+LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := libgps + +LOCAL_STATIC_LIBRARIES:= \ +# include any static library dependencies + +LOCAL_SHARED_LIBRARIES := \ +# include any shared library dependencies + +LOCAL_SRC_FILES += \ +# include your source files. eg. MyGpsLibrary.cpp + +LOCAL_CFLAGS += \ +# include any needed compile flags + +LOCAL_C_INCLUDES:= \ +# include any needed local header files + +include $(BUILD_SHARED_LIBRARY) ++ + +
Interface
+ + + diff --git a/pdk/docs/group__memory.html b/pdk/docs/group__memory.jd similarity index 54% rename from pdk/docs/group__memory.html rename to pdk/docs/group__memory.jd index 44d078280..87f19d5f9 100755 --- a/pdk/docs/group__memory.html +++ b/pdk/docs/group__memory.jd @@ -1,19 +1,6 @@ - - - - -
-Porividng Heap Memory
This is the text in the "Providing Heap Memory" subgroup
-
-
+
diff --git a/pdk/docs/group__networking.html b/pdk/docs/group__networking.jd
similarity index 57%
rename from pdk/docs/group__networking.html
rename to pdk/docs/group__networking.jd
index 6a8e1b846..c5a94fcf2 100755
--- a/pdk/docs/group__networking.html
+++ b/pdk/docs/group__networking.jd
@@ -1,19 +1,6 @@
-
-
-
-
-Porividng Heap Memory
+
[Neworking Support]
-
+
+
Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Instrumentation Framework
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+Android - Porting Guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Neworking Support
Modules | |
| Porividng Heap Memory | |
Detailed Description
This is a text for the Networking Support Group - - + diff --git a/pdk/docs/index.html b/pdk/docs/index.html deleted file mode 100755 index 6eac80b5a..000000000 --- a/pdk/docs/index.html +++ /dev/null @@ -1,248 +0,0 @@ - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- The Open Handset Distribution (OHD) is a software distribution for mobile devices, often referred to as Android, developed by members of the Open Handset Alliance. Android includes an operating system, middleware, and key applications typically required for a mobile device.
- -This porting guide describes the steps necessary to port Android to a new mobile device. Android is designed as a highly-portable, hardware-independent platform based on Linux, and porting the platform to new devices requires little more than porting the Linux kernel and developing the Linux drivers necessary for your device.
- -The current version of this guide describes bringing Android up to "PDA-level" functionality; functionality sufficient to support non-multimedia apps that run on unconnected mobile devices through the standard user interface devices such as keypad and display. Future versions of this guide will cover complete telephony, multi-media and peripheral integration to create a complete mobile device.
- - -Intended Audience
- -This porting guide is intended for engineers proficient with running (and writing drivers for) Linux on embedded devices. -
The guide also assumes you have a target hardware that matches Device Requirements and that you -can boot and run a recent (2.6.x) version of the Linux kernel -with at least keypad and display drivers properly installed.
- - -Getting Started with Android
- -To get started with Android, start with the publicly-available documentation at http://code.google.com/android/documentation.html, paying particular attention to What is Android? and Getting Started with Android.
- - -Porting Android to Your Device
- -Start with the following sections in order to port Android to your target hardware.
--
-
- Device Requirements -
- What must your device support in order to successfully port Android to it? -
- Setting up a Development Environment - -
- Install necessary packages and retrieve source code through a Git server. Build System offers a conceptual overview of Android's build system and instructions to affect a simple build. -
- Basic Bring up -
- Establish core components necessary to your device, such as keymaps / keyboard input and display drivers. -
- -
v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/index.jd b/pdk/docs/index.jd
new file mode 100644
index 000000000..b7529d3a7
--- /dev/null
+++ b/pdk/docs/index.jd
@@ -0,0 +1,39 @@
+home=true
+page.title=Welcome to the Android Porting Guide
+pdk.version=1.0
+@jd:body
+
+
+The Open Handset Distribution (OHD) is a software distribution for mobile devices, often referred to as Android, developed by members of the Open Handset Alliance. Android includes an operating system, middleware, and key applications typically required for a mobile device.
+ +This porting guide describes the steps necessary to port Android to a new mobile device. Android is designed as a highly-portable, hardware-independent platform based on Linux, and porting the platform to new devices requires little more than porting the Linux kernel and developing the Linux drivers necessary for your device.
+ +The current version of this guide describes bringing Android up to "PDA-level" functionality; functionality sufficient to support non-multimedia apps that run on unconnected mobile devices through the standard user interface devices such as keypad and display. Future versions of this guide will cover complete telephony, multi-media and peripheral integration to create a complete mobile device.
+ + +Intended Audience
+ +This porting guide is intended for engineers proficient with running (and writing drivers for) Linux on embedded devices. +
The guide also assumes you have a target hardware that matches Device Requirements and that you +can boot and run a recent (2.6.x) version of the Linux kernel +with at least keypad and display drivers properly installed.
+ + +Getting Started with Android
+ +To get started with Android, start with the publicly-available documentation at http://code.google.com/android/documentation.html, paying particular attention to What is Android? and Getting Started with Android.
+ + +Porting Android to Your Device
+ +Start with the following sections in order to port Android to your target hardware.
+-
+
- Device Requirements +
- What must your device support in order to successfully port Android to it? +
- Setting up a Development Environment + +
- Install necessary packages and retrieve source code through a Git server. Build System offers a conceptual overview of Android's build system and instructions to affect a simple build. +
- Basic Bring up +
- Establish core components necessary to your device, such as keymaps / keyboard input and display drivers. +
- +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - -
- Dev Environment Setup - - -
- Basic Bring up - - -
- Multimedia
-
-
-
- Audio Subsystem -
- - Power Management
-
-
-
- Power Management -
- - Telephony - - -
- Testing - - -
-
-
-
-
-
-
-
+TroubleshootingInstrumentation Framework
- - +page.title=Instrumentation Framework +@jd:body
@@ -152,7 +7,7 @@ h1,h2,h3 {
Understanding the am Command
Writing and Running Test Cases
Exploring a Test Case
-Troubleshooting
Writing and Running Test Cases
Exploring a Test Case
-Troubleshooting
Introduction
@@ -284,33 +139,3 @@ E/AndroidRuntime( 688): ERROR: thread attach failedIt's possible that the instrumentation apk isn't installed on your device or that the package name is incorrect in the Manifest file.
- - v0.3 - 9 June 2008
-
-
-
diff --git a/pdk/docs/instrumentation_testing.html b/pdk/docs/instrumentation_testing.jd
similarity index 77%
rename from pdk/docs/instrumentation_testing.html
rename to pdk/docs/instrumentation_testing.jd
index 931fd77d3..c0248aec4 100755
--- a/pdk/docs/instrumentation_testing.html
+++ b/pdk/docs/instrumentation_testing.jd
@@ -1,180 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
+Troubleshooting
-
-
-
Instrumentation Testing
- - +page.title=Instrumentation Testing +@jd:body
@@ -204,7 +29,7 @@ h1,h2,h3 {
New InstrumentationTestCase
Exploring a Test Case
Deciding Kinds of Tests to Write
-TroubleshootingExploring a Test Case
Deciding Kinds of Tests to Write
Introduction
@@ -687,33 +512,3 @@ E/AndroidRuntime( 688): ERROR: thread attach failedIt's possible that the instrumentation apk isn't installed on your device or that the package name is incorrect in the Manifest file.
- - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/intro_source_code.html b/pdk/docs/intro_source_code.html
deleted file mode 100755
index f86b56805..000000000
--- a/pdk/docs/intro_source_code.html
+++ /dev/null
@@ -1,378 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup - - -
- Basic Bring up - - - - -
- Multimedia
-
-
-
- Audio Subsystem -
- Camera -
- - Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -Android source code is maintained in two code bases: the Android Linux kernel (kernel directory) and Android platform and applications (device directory). This document provides a high-level introduction to the source code organization and an overview of the major components of each primary directory.
Android Source
- - -Linux Kernel
- -The Android Linux kernel includes enhancements to the Linux 2.6 kernel that provide additional drivers to support the Android platform, including:
--
-
- Binder: an OpenBinder-based driver to facilitate inter-process communication (IPC) in the Android platform. -
- Android Power Management: a light weight power management driver built on top of standard Linux power management but optimized for embedded systems. -
- Low Memory Killer: Based on hints from the userspace, the low memory killer can kill off processes to free up memory as necessary. It is designed to provide more flexibility than the Out Of Memory (OOM) killer in the standard kernel. -
- Logger: A light weight logging device used to capture system, radio, logdata, etc. -
- USB Gadget: Uses the USB function framework. -
- Android/PMEM: The PMEM (physical memory) driver is used to provide contiguous physical memory regions to userspace libraries that interact with the digital signal processor (DSP) and other hardware that cannot cope with scatter-gather. -
- Android Alarm: A driver which provides timers that can wake the device up from sleep and a monotonic timebase that runs while the device is asleep. -
Look for Android-specific enhancements in the following directories:
--
-
/drivers/android
-/drivers/misc
-/include/linux
-
Android Platform and Applications
- -The following list outlines the directory structure found within the device branch of Android source code:
-
-
-
-
- apps -Core Android applications such as Phone, Camera, and Calendar. - - - -
- boot -Reference Android bootloader and other boot-related source code. - - - -
- commands -Common Android commands, the most important of which is the runtime command, which does much of the initialization of the system. - - - -
- config -System-wide makefiles and linker scripts. - - - -
- content -Standard Android ContentProvider modules. - - - -
- dalvik -Android runtime Virtual Machine (VM). - - - -
- data -Fonts, keymaps, sounds, timezone information, etc. - - - -
- docs -Full set of Android documentation. - - - -
- extlibs -Non-Android libraries. This directory is intended to host unmodified external code. None of the libraries included within this directory rely on Android headers or libraries. - - - -
- ide -Tools for support of the IDE's used to write Android applications. - - - -
- include -Android system headers for inclusion. - - - -
- java -Android core APIs, as well as some external libraries. - - - -
- libs -Android-specific C++ based libraries. - - - -
- partner -Project-specific source code for various proprietary components. - - - -
- prebuilt -Prebuilt tools, like the toolchains and emulator binary. - - - -
- product -Device-specific configuration files. This directory will include a subdirectory for each new device. - - - -
- samples -Sample applications. - - - -
- servers -C++ based system servers. - - - -
- system -Core of the embedded Linux platform at the heart of Android. These essential bits are required for basic booting, operation, and debugging. - - - -
- tests -Platform and application test cases. - - - -
- tools -Tools for building and debugging Android (of particular interest for porting are "adb" and "emulator"). - - - - -
Adding Source Code
- -You can develop Android applications with the same standard tools you use to develop any Java application. The Android core libraries provide the functionality needed to build rich mobile applications and the Android development tools are designed to simplify running, debugging, and testing your applications.
- -Add project-specific source code to the Android source tree under the partner directory in a directory specific to the application or service you are building. For example, all Google-specific applications would be placed under device/partner/google/. A Google search application would be placed under device/partner/google/apps/Search.
-
See Building Android for a new Mobile Device for detailed instructions.
- - - - v0.5 - 25 September 2008
-
-
-
diff --git a/pdk/docs/intro_source_code.jd b/pdk/docs/intro_source_code.jd
new file mode 100755
index 000000000..100f3ee5b
--- /dev/null
+++ b/pdk/docs/intro_source_code.jd
@@ -0,0 +1,169 @@
+page.title=Source Code Overview
+@jd:body
+
+
+
+
+Introduction
+ +Android source code is maintained in two code bases: the Android Linux kernel (kernel directory) and Android platform and applications (device directory). This document provides a high-level introduction to the source code organization and an overview of the major components of each primary directory.
Android Source
+ + +Linux Kernel
+ +The Android Linux kernel includes enhancements to the Linux 2.6 kernel that provide additional drivers to support the Android platform, including:
+-
+
- Binder: an OpenBinder-based driver to facilitate inter-process communication (IPC) in the Android platform. +
- Android Power Management: a light weight power management driver built on top of standard Linux power management but optimized for embedded systems. +
- Low Memory Killer: Based on hints from the userspace, the low memory killer can kill off processes to free up memory as necessary. It is designed to provide more flexibility than the Out Of Memory (OOM) killer in the standard kernel. +
- Logger: A light weight logging device used to capture system, radio, logdata, etc. +
- USB Gadget: Uses the USB function framework. +
- Android/PMEM: The PMEM (physical memory) driver is used to provide contiguous physical memory regions to userspace libraries that interact with the digital signal processor (DSP) and other hardware that cannot cope with scatter-gather. +
- Android Alarm: A driver which provides timers that can wake the device up from sleep and a monotonic timebase that runs while the device is asleep. +
Look for Android-specific enhancements in the following directories:
+-
+
/drivers/android
+/drivers/misc
+/include/linux
+
Android Platform and Applications
+ +The following list outlines the directory structure found within the device branch of Android source code:
-
+
+
+
- apps +Core Android applications such as Phone, Camera, and Calendar. + + + +
- boot +Reference Android bootloader and other boot-related source code. + + + +
- commands +Common Android commands, the most important of which is the runtime command, which does much of the initialization of the system. + + + +
- config +System-wide makefiles and linker scripts. + + + +
- content +Standard Android ContentProvider modules. + + + +
- dalvik +Android runtime Virtual Machine (VM). + + + +
- data +Fonts, keymaps, sounds, timezone information, etc. + + + +
- docs +Full set of Android documentation. + + + +
- extlibs +Non-Android libraries. This directory is intended to host unmodified external code. None of the libraries included within this directory rely on Android headers or libraries. + + + +
- ide +Tools for support of the IDE's used to write Android applications. + + + +
- include +Android system headers for inclusion. + + + +
- java +Android core APIs, as well as some external libraries. + + + +
- libs +Android-specific C++ based libraries. + + + +
- partner +Project-specific source code for various proprietary components. + + + +
- prebuilt +Prebuilt tools, like the toolchains and emulator binary. + + + +
- product +Device-specific configuration files. This directory will include a subdirectory for each new device. + + + +
- samples +Sample applications. + + + +
- servers +C++ based system servers. + + + +
- system +Core of the embedded Linux platform at the heart of Android. These essential bits are required for basic booting, operation, and debugging. + + + +
- tests +Platform and application test cases. + + + +
- tools +Tools for building and debugging Android (of particular interest for porting are "adb" and "emulator"). + + + + +
Adding Source Code
+ +You can develop Android applications with the same standard tools you use to develop any Java application. The Android core libraries provide the functionality needed to build rich mobile applications and the Android development tools are designed to simplify running, debugging, and testing your applications.
+ +Add project-specific source code to the Android source tree under the partner directory in a directory specific to the application or service you are building. For example, all Google-specific applications would be placed under device/partner/google/. A Google search application would be placed under device/partner/google/apps/Search.
+
See Building Android for a new Mobile Device for detailed instructions.
+ + diff --git a/pdk/docs/keymaps_keyboard_input.html b/pdk/docs/keymaps_keyboard_input.jd similarity index 71% rename from pdk/docs/keymaps_keyboard_input.html rename to pdk/docs/keymaps_keyboard_input.jd index 9a1a66a42..d52a73fe3 100755 --- a/pdk/docs/keymaps_keyboard_input.html +++ b/pdk/docs/keymaps_keyboard_input.jd @@ -1,180 +1,5 @@ - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
+Sample Implementation
-
-
-
-Sample Implementation
Keymaps and Keyboard Input
- - +page.title=Keymaps and Keyboard Input +@jd:body Implementing Your Own Driver (Driver Template)-Sample Implementation
Introduction
@@ -682,32 +507,3 @@ I/KeyInputQueue( 1548): Keymap: partnerxx_keypad.klThe snippet above contains artificial line breaks to maintain a print-friendly document.
- v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/power_management.html b/pdk/docs/power_management.html
deleted file mode 100755
index eb510dd90..000000000
--- a/pdk/docs/power_management.html
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
-
-
-
-
- Introduction
- -Android supports its own Power Management (on top of the standard Linux Power Management) designed with the premise that the CPU shouldn't consume power if no applications or services require power. For more information regarding standard Linux power management, please see Linux Power Management Support at http://kernel.org.
-Android requires that applications and services request CPU resources with "wake locks" through the Android application framework and native Linux libraries. If there are no active wake locks, Android will shut down the CPU.
-The image below illustrates the Android power management architecture.
-
Wake Locks
- -Wake locks are used by applications and services to request CPU resources.
- - -Types of Wake Locks
- -| Wake Lock | -Description | -
|---|---|
| ACQUIRE_CAUSES_WAKEUP |
- Normally wake locks don't actually wake the device, they just cause it to remain on once it's already on. Think of the video player app as the normal behavior. Notifications that pop up and want the device to be on are the exception; use this flag to be like them. | -
| FULL_WAKE_LOCK | -Wake lock that ensures that the screen and keyboard are on at full brightness. | -
| ON_AFTER_RELEASE | -When this wake lock is released, poke the user activity timer so the screen stays on for a little longer. | -
| PARTIAL_WAKE_LOCK | -Wake lock that ensures that the CPU is running. The screen might not be on. | -
| SCREEN_BRIGHT_WAKE_LOCK | -Wake lock that ensures that the screen is on at full brightness; the keyboard backlight will be allowed to go off. | -
| SCREEN_DIM_WAKE_LOCK | -Wake lock that ensures that the screen is on, but the keyboard backlight will be allowed to go off, and the screen backlight will be allowed to go dim. | -
Exploring a Wake Lock Example
- -All power management calls follow the same basic format:
-- Acquire handle to the
PowerManagerservice.
- - Create a wake lock and specify the power management flags for screen, timeout, etc. -
- Acquire wake lock. -
- Perform operation (play MP3, open HTML page, etc.). -
- Release wake lock. -
The snippet below illustrates this process.
--PowerManager pm = (PowerManager)mContext.getSystemService( - Context.POWER_SERVICE); -PowerManager.WakeLock wl = pm.newWakeLock( - PowerManager.SCREEN_DIM_WAKE_LOCK - | PowerManager.ON_AFTER_RELEASE, - TAG); -wl.acquire(); - // ... -wl.release(); -- - -
PowerManager class
- -The Android Framework exposes power management to services and applications through the PowerManager class.
User space native libraries (any hardware function in //device/lib/hardware/ meant to serve as supporting libraries for Android runtime) should never call into Android Power Management directly (see the image above). Bypassing the power management policy in the Android runtime will destabilize the system.
All calls into Power Management should go through the Android runtime PowerManager APIs.
-Please visit -http://code.google.com/android/reference/android/os/PowerManager.html for a description of the API and examples.
- - -Registering Drivers with the PM Driver
- -You can register Kernel-level drivers with the Android Power Manager driver so that they're notified immediately before power down or after power up. For example, you might set a display driver to completely power down when a request comes in to power down from the user space (see the Android MSM MDDI display driver for a sample implementation).
-To register drivers with the Android PM driver, implement call-back handlers and register them with the Android PM, as illustrated in the snippet below:
--android_register_early_suspend(android_early_suspend_t *handler) -android_register_early_resume(android_early_resume_t *handler) --
It is critical in a drive to return immediately and not wait for anything to happen in the call back.
- - - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/power_management.jd b/pdk/docs/power_management.jd
new file mode 100755
index 000000000..52c23e803
--- /dev/null
+++ b/pdk/docs/power_management.jd
@@ -0,0 +1,108 @@
+page.title=Power Management
+@jd:body
+
+
+
+
+Introduction
+ +Android supports its own Power Management (on top of the standard Linux Power Management) designed with the premise that the CPU shouldn't consume power if no applications or services require power. For more information regarding standard Linux power management, please see Linux Power Management Support at http://kernel.org.
+Android requires that applications and services request CPU resources with "wake locks" through the Android application framework and native Linux libraries. If there are no active wake locks, Android will shut down the CPU.
+The image below illustrates the Android power management architecture.
+
Solid elements represent Android blocks and dashed elements represent partner-specific blocks.
+ + + +Wake Locks
+ +Wake locks are used by applications and services to request CPU resources.
+ + +Types of Wake Locks
+ +| Wake Lock | +Description | +
|---|---|
| ACQUIRE_CAUSES_WAKEUP |
+ Normally wake locks don't actually wake the device, they just cause it to remain on once it's already on. Think of the video player app as the normal behavior. Notifications that pop up and want the device to be on are the exception; use this flag to be like them. | +
| FULL_WAKE_LOCK | +Wake lock that ensures that the screen and keyboard are on at full brightness. | +
| ON_AFTER_RELEASE | +When this wake lock is released, poke the user activity timer so the screen stays on for a little longer. | +
| PARTIAL_WAKE_LOCK | +Wake lock that ensures that the CPU is running. The screen might not be on. | +
| SCREEN_BRIGHT_WAKE_LOCK | +Wake lock that ensures that the screen is on at full brightness; the keyboard backlight will be allowed to go off. | +
| SCREEN_DIM_WAKE_LOCK | +Wake lock that ensures that the screen is on, but the keyboard backlight will be allowed to go off, and the screen backlight will be allowed to go dim. | +
Exploring a Wake Lock Example
+ +All power management calls follow the same basic format:
+- Acquire handle to the
PowerManagerservice.
+ - Create a wake lock and specify the power management flags for screen, timeout, etc. +
- Acquire wake lock. +
- Perform operation (play MP3, open HTML page, etc.). +
- Release wake lock. +
The snippet below illustrates this process.
++PowerManager pm = (PowerManager)mContext.getSystemService( + Context.POWER_SERVICE); +PowerManager.WakeLock wl = pm.newWakeLock( + PowerManager.SCREEN_DIM_WAKE_LOCK + | PowerManager.ON_AFTER_RELEASE, + TAG); +wl.acquire(); + // ... +wl.release(); ++ + +
PowerManager class
+ +The Android Framework exposes power management to services and applications through the PowerManager class.
User space native libraries (any hardware function in //device/lib/hardware/ meant to serve as supporting libraries for Android runtime) should never call into Android Power Management directly (see the image above). Bypassing the power management policy in the Android runtime will destabilize the system.
All calls into Power Management should go through the Android runtime PowerManager APIs.
+Please visit +http://code.google.com/android/reference/android/os/PowerManager.html for a description of the API and examples.
+ + +Registering Drivers with the PM Driver
+ +You can register Kernel-level drivers with the Android Power Manager driver so that they're notified immediately before power down or after power up. For example, you might set a display driver to completely power down when a request comes in to power down from the user space (see the Android MSM MDDI display driver for a sample implementation).
+To register drivers with the Android PM driver, implement call-back handlers and register them with the Android PM, as illustrated in the snippet below:
++android_register_early_suspend(android_early_suspend_t *handler) +android_register_early_resume(android_early_resume_t *handler) ++
It is critical in a drive to return immediately and not wait for anything to happen in the call back.
+ + + diff --git a/pdk/docs/source_setup_guide.html b/pdk/docs/source_setup_guide.html deleted file mode 100755 index 1588b2946..000000000 --- a/pdk/docs/source_setup_guide.html +++ /dev/null @@ -1,323 +0,0 @@ - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup - - -
- Basic Bring up - - - - -
- Multimedia
-
-
-
- Audio Subsystem -
- Camera -
- - Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -This section provides instructions on how to configure your host system to build Android for mobile devices. While Android is designed as host-environment agnostic, it has been tested and is known to work on the following Linux operating system; Ubuntu 6.06 (Dapper), 7.10 (Gutsy), and 8.04. Cygwin is not recommended.
- - -Installing Packages
- - - -Required Packages
- -Android requires the following system packages:
--
-
- flex: This lexical analyzer generator is used to read a given input file for a description of a scanner to generate. -
- bison: This is a general-purpose parser generator. -
- gperf: This is a perfect hash function generator. -
- libesd0-dev: This enlightened sound daemon (dev files) is used to mix digitized audio streams for playback by a single device. -
- libwxgtk2.6-dev: This package provides GUI components and other facilities for many different platforms. -
- build-essential: This package contains a list of packages considered fundamental to building Debian packages. -
Ubuntu 6.06 (Dapper)
- -On a clean Dapper system, type the following:
--% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev zlib1g-dev - build-essential --
This snippet includes an artificial line break to maintain a print-friendly document.
- - -Ubuntu 7.10
- -- The libwxgtk2.6-dev package will only work if the following code is included in your /etc/apt/source file.
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free license. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## universe WILL NOT receive any review or updates from the Ubuntu security -## team. -# Line commented out by installer because it failed to verify: -deb http://us.archive.ubuntu.com/ubuntu/ gutsy universe -# Line commented out by installer because it failed to verify: -deb-src http://us.archive.ubuntu.com/ubuntu/ gutsy universe -# Line commented out by installer because it failed to verify: -deb http://us.archive.ubuntu.com/ubuntu/ gutsy-updates universe -# Line commented out by installer because it failed to verify: -deb-src http://us.archive.ubuntu.com/ubuntu/ gutsy-updates universe -
- - Install required packages with the following command:
-
-% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev zlib1g-dev - build-essential -
-This snippet includes an artificial line break to maintain a print-friendly document. -
- -
-
Install the X11 development environment with the following commands:
--% sudo apt-get install x-dev -% sudo apt-get install libx11-dev -% sudo apt-get install libncurses5-dev -
-
-
Ubuntu 8.04
- -On a clean system, type the following:
--% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev -zlib1g-dev build-essential -% sudo apt-get install x-dev -% sudo apt-get install libx11-dev -% sudo apt-get install libncurses5-dev -% sudo apt-get install sun-java5-jdk -- - -
Installing Java
- -Android source code includes a hard dependency on the Java Developer Kit (JDK) 5.0 Update 12 or greater. The specific file name of the Update 12 package is jdk-1_5_0_12-linux-i586.bin. To download this version of the Java JDK:
-
-
- Navigate to: http://java.sun.com/products/archive/. -
- Select '5.0 Update 12' from the 'Java 2 Platform Standard Edition (J2SE)' -> 'JDK/JRE - 5.0' field and click 'Go.' -
- Click 'Download JDK.' -
- In the 'Linux Platform' section, click 'Linux self-extracting file' associated with the jdk-1_5_0_12-linux-i586.bin package. -
- Follow the installation instructions. -
Once you have cleanly installed the JDK, modify your PATH environment variable to include <jdk-install-dir>/jdk1.5.0_12/bin at its beginning so that Dapper will use the correct installation.
Ubuntu 7.10
-An alternative method to quickly install Java is to enable multiverse repo in /etc/apt/sources.list and then execute:
-% sudo apt-get install sun-java5-jdk -- - -
v0.5 - 25 September 2008
-
-
-
diff --git a/pdk/docs/source_setup_guide.jd b/pdk/docs/source_setup_guide.jd
new file mode 100755
index 000000000..5c0bed5e1
--- /dev/null
+++ b/pdk/docs/source_setup_guide.jd
@@ -0,0 +1,116 @@
+page.title=Host System Setup
+@jd:body
+
+
+
+
+Introduction
+ +This section provides instructions on how to configure your host system to build Android for mobile devices. While Android is designed as host-environment agnostic, it has been tested and is known to work on the following Linux operating system; Ubuntu 6.06 (Dapper), 7.10 (Gutsy), and 8.04. Cygwin is not recommended.
+ + +Installing Packages
+ + + +Required Packages
+ +Android requires the following system packages:
+-
+
- flex: This lexical analyzer generator is used to read a given input file for a description of a scanner to generate. +
- bison: This is a general-purpose parser generator. +
- gperf: This is a perfect hash function generator. +
- libesd0-dev: This enlightened sound daemon (dev files) is used to mix digitized audio streams for playback by a single device. +
- libwxgtk2.6-dev: This package provides GUI components and other facilities for many different platforms. +
- build-essential: This package contains a list of packages considered fundamental to building Debian packages. +
Ubuntu 6.06 (Dapper)
+ +On a clean Dapper system, type the following:
++% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev zlib1g-dev + build-essential ++
This snippet includes an artificial line break to maintain a print-friendly document.
+ + +Ubuntu 7.10
+ +- The libwxgtk2.6-dev package will only work if the following code is included in your /etc/apt/source file.
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu +## team, and may not be under a free license. Please satisfy yourself as to +## your rights to use the software. Also, please note that software in +## universe WILL NOT receive any review or updates from the Ubuntu security +## team. +# Line commented out by installer because it failed to verify: +deb http://us.archive.ubuntu.com/ubuntu/ gutsy universe +# Line commented out by installer because it failed to verify: +deb-src http://us.archive.ubuntu.com/ubuntu/ gutsy universe +# Line commented out by installer because it failed to verify: +deb http://us.archive.ubuntu.com/ubuntu/ gutsy-updates universe +# Line commented out by installer because it failed to verify: +deb-src http://us.archive.ubuntu.com/ubuntu/ gutsy-updates universe +
+ - Install required packages with the following command:
+
+% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev zlib1g-dev + build-essential +
+This snippet includes an artificial line break to maintain a print-friendly document. +
+ -
+
Install the X11 development environment with the following commands:
++% sudo apt-get install x-dev +% sudo apt-get install libx11-dev +% sudo apt-get install libncurses5-dev +
+
+
Ubuntu 8.04
+ +On a clean system, type the following:
++% sudo apt-get install flex bison gperf libesd0-dev libwxgtk2.6-dev +zlib1g-dev build-essential +% sudo apt-get install x-dev +% sudo apt-get install libx11-dev +% sudo apt-get install libncurses5-dev +% sudo apt-get install sun-java5-jdk ++ + +
Installing Java
+ +Android source code includes a hard dependency on the Java Developer Kit (JDK) 5.0 Update 12 or greater. The specific file name of the Update 12 package is jdk-1_5_0_12-linux-i586.bin. To download this version of the Java JDK:
-
+
- Navigate to: http://java.sun.com/products/archive/. +
- Select '5.0 Update 12' from the 'Java 2 Platform Standard Edition (J2SE)' -> 'JDK/JRE - 5.0' field and click 'Go.' +
- Click 'Download JDK.' +
- In the 'Linux Platform' section, click 'Linux self-extracting file' associated with the jdk-1_5_0_12-linux-i586.bin package. +
- Follow the installation instructions. +
Once you have cleanly installed the JDK, modify your PATH environment variable to include <jdk-install-dir>/jdk1.5.0_12/bin at its beginning so that Dapper will use the correct installation.
Ubuntu 7.10
+An alternative method to quickly install Java is to enable multiverse repo in /etc/apt/sources.list and then execute:
+% sudo apt-get install sun-java5-jdk ++ + + diff --git a/pdk/docs/system_requirements.html b/pdk/docs/system_requirements.html deleted file mode 100755 index 2f236cf80..000000000 --- a/pdk/docs/system_requirements.html +++ /dev/null @@ -1,262 +0,0 @@ - - - - -
-
-
-
-
-
diff --git a/pdk/docs/system_requirements.jd b/pdk/docs/system_requirements.jd
new file mode 100755
index 000000000..1b203ea2f
--- /dev/null
+++ b/pdk/docs/system_requirements.jd
@@ -0,0 +1,63 @@
+page.title=Device Requirements
+pdk.version=1.0
+@jd:body
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
-
-
-
-
-
- Device Requirements
- -While Android is designed to support a wide variety of hardware platforms and configurations, this section provides recommended minimum device requirements.
-| Feature | -Minimum Requirement | -Notes | -
|---|---|---|
| Chipset | -ARM-based | -For the first release, Android is primarily targeted towards mobile handsets and portions of the platform, such as Dalvik VM graphics processing, currently assume an ARM architecture. | -
| Memory | -128 MB RAM; 256 MB Flash External | -Android can boot and run in configurations with less memory, but it isn't recommended. | -
| Storage | -Mini or Micro SD | -Not necessary for basic bring up, but recommended. | -
| Primary Display | -HVGA required | -The current Android interface targets a touch-based HVGA resolution display with a touch-interface no smaller than 2.8 inches in size. However, smaller displays will suffice for initial porting. | -
| Navigation Keys | -5-way navigation with 5 application keys, power, camera and volume controls | -- |
| Camera | -2MP CMOS | -Not required for basic bring up. | -
| USB | -Standard mini-B USB interface | -Android uses the USB interface for flashing the device system images and debugging a running device. | -
| Bluetooth | -1.2 or 2.0 | -Not required for initial bring up. | -
If available, your Android device can also benefit from the following optional device characteristics:
--
-
- QWERTY keyboard -
- WiFi -
- GPS -
v0.6 - 25 November 2008
-While Android is designed to support a wide variety of hardware platforms and configurations, this section provides recommended minimum device requirements.
+ +| Feature | +Minimum Requirement | +Notes | +
|---|---|---|
| Chipset | +ARM-based | +For the first release, Android is primarily targeted towards mobile handsets and portions of the platform, such as Dalvik VM graphics processing, currently assume an ARM architecture. | +
| Memory | +128 MB RAM; 256 MB Flash External | +Android can boot and run in configurations with less memory, but it isn't recommended. | +
| Storage | +Mini or Micro SD | +Not necessary for basic bring up, but recommended. | +
| Primary Display | +HVGA required | +The current Android interface targets a touch-based HVGA resolution display with a touch-interface no smaller than 2.8 inches in size. However, smaller displays will suffice for initial porting. | +
| Navigation Keys | +5-way navigation with 5 application keys, power, camera and volume controls | ++ |
| Camera | +2MP CMOS | +Not required for basic bring up. | +
| USB | +Standard mini-B USB interface | +Android uses the USB interface for flashing the device system images and debugging a running device. | +
| Bluetooth | +1.2 or 2.0 | +Not required for initial bring up. | +
If available, your Android device can also benefit from the following optional device characteristics:
+-
+
- QWERTY keyboard +
- WiFi +
- GPS +
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
+RIL Unsolicited CommandsRadio Layer Interface
- - +page.title=Radio Layer Interface +@jd:body
@@ -190,7 +15,7 @@ h1,h2,h3 {
RIL Functions
Introduction
@@ -397,33 +222,3 @@ RIL_RadioFunctions; v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/wifi.html b/pdk/docs/wifi.html
deleted file mode 100755
index df40fb0a0..000000000
--- a/pdk/docs/wifi.html
+++ /dev/null
@@ -1,250 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-
-
-
Documentation
--
-
- Introduction - - - -
- Dev Environment Setup
-
-
-
- Build System -
- - Basic Bring up - - - - -
- Multimedia - - -
- Power Management
-
-
-
-
- Power Management -
-
- - Networking - - - -
- Telephony
-
-
-
- Radio Interface Layer - -
- - Testing - - - -
-
-
-
-
-
-
-
- Introduction
- -Android uses wpa_supplicant as the platform interface to the Wi-Fi device. Your Wi-Fi driver must be compatible with the standard wpa_supplicant in addition to extensions added to the supplicant (specifically, the "DRIVER" commands described in wifi.h/wifi_command()).
Building a Wi-Fi Library
- -To create a Wi-Fi driver for Android:
--
-
- create a shared library that implements the interface defined in
include/hardware/wifi.h, which also defines the Wi-Fi supplicant.
- - Follow the instructions posted at http://hostap.epitest.fi/wpa_supplicant/. -
- Place your driver in
libs/hardware/wifi/
- - Test your driver using the command line
wpa_cliutilities.
-
You can find the default implementation in libs/hardware/wifi/wifi.c. If you need to make changes, create a new source file similar to wifi.c, for example, wifi_mywifi.c.
Update the default Android.mk file (libs/hardware/wifi/Android.mk) as shown below.
-LOCAL_SHARED_LIBRARIES += libnetutils - -ifeq ($(TARGET_DEVICE),acme) -LOCAL_SRC_FILES += wifi/wifi_mywifi.c -else -LOCAL_SRC_FILES += wifi/wifi.c -endif -- - -
Interface
- - - -Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
- - - - - - v0.6 - 25 November 2008
-
-
-
diff --git a/pdk/docs/wifi.jd b/pdk/docs/wifi.jd
new file mode 100755
index 000000000..42cb14cad
--- /dev/null
+++ b/pdk/docs/wifi.jd
@@ -0,0 +1,49 @@
+page.title=Wi-Fi
+@jd:body
+
+
+
+
+Introduction
+ +Android uses wpa_supplicant as the platform interface to the Wi-Fi device. Your Wi-Fi driver must be compatible with the standard wpa_supplicant in addition to extensions added to the supplicant (specifically, the "DRIVER" commands described in wifi.h/wifi_command()).
Building a Wi-Fi Library
+ +To create a Wi-Fi driver for Android:
+-
+
- create a shared library that implements the interface defined in
include/hardware/wifi.h, which also defines the Wi-Fi supplicant.
+ - Follow the instructions posted at http://hostap.epitest.fi/wpa_supplicant/. +
- Place your driver in
libs/hardware/wifi/
+ - Test your driver using the command line
wpa_cliutilities.
+
You can find the default implementation in libs/hardware/wifi/wifi.c. If you need to make changes, create a new source file similar to wifi.c, for example, wifi_mywifi.c.
Update the default Android.mk file (libs/hardware/wifi/Android.mk) as shown below.
+LOCAL_SHARED_LIBRARIES += libnetutils + +ifeq ($(TARGET_DEVICE),acme) +LOCAL_SRC_FILES += wifi/wifi_mywifi.c +else +LOCAL_SRC_FILES += wifi/wifi.c +endif ++ + +
Interface
+ + + +Note: This document relies on some Doxygen-generated content that appears in an iFrame below. To return to the Doxygen default content for this page, click here.
+ + + + + + diff --git a/pdk/hosting/app.yaml b/pdk/hosting/app.yaml index 407cbb08b..6e08141bc 100644 --- a/pdk/hosting/app.yaml +++ b/pdk/hosting/app.yaml @@ -4,8 +4,8 @@ runtime: python api_version: 1 handlers: -- url: /docs - static_dir: docs +- url: /online-pdk + static_dir: online-pdk - url: / script: pdk.py diff --git a/pdk/hosting/pdk.py b/pdk/hosting/pdk.py index e88f826f8..421f19550 100644 --- a/pdk/hosting/pdk.py +++ b/pdk/hosting/pdk.py @@ -26,11 +26,9 @@ from google.appengine.ext.webapp.util import run_wsgi_app class MainPage(webapp.RequestHandler): def get(self): - self.redirect('docs/index.html') + self.redirect('online-pdk/index.html') -application = webapp.WSGIApplication( - [('/', MainPage)], - debug=True) +application = webapp.WSGIApplication([('/', MainPage)], debug=True) def main(): run_wsgi_app(application) @@ -38,6 +36,18 @@ def main(): if __name__ == "__main__": main() +# Testing +# You must install google appengine. See: http://code.google.com/appengine/downloads.html +# +# Here's the command to run the pdk-docs server locally: +# python-
- *
- Examine the current file name to retrieve the XML filename, if any. - *
- Recompute the path based on the configuration selector (e.g. /res/values-fr/). - *
- Examine the path to retrieve all the files in it. Keep those in a local cache. - *
- If the XML filename from step 1 is not in the file list, it's a custom file name. - * Insert it and sort it. - *
- Re-populate the file combo with all the choices. - *
- Select the original XML file.
- */
- public void run() {
- if (mInternalConfigChange) {
- return;
- }
-
- // get current leafname, if any
- String leafName = "";
- String currPath = mResFileCombo.getText();
- Matcher m = mPathRegex.matcher(currPath);
- if (m.matches()) {
- // Note: groups 1 and 2 cannot be null.
- leafName = m.group(2);
- currPath = m.group(1);
- } else {
- // There was a path but it was invalid. Ignore it.
- currPath = "";
- }
-
- // recreate the res path from the current configuration
- mConfigSelector.getConfiguration(mTempConfig);
- StringBuffer sb = new StringBuffer(RES_FOLDER_ABS);
- sb.append(mTempConfig.getFolderName(ResourceFolderType.VALUES));
- sb.append('/');
-
- String newPath = sb.toString();
- if (newPath.equals(currPath) && newPath.equals(mLastFolderUsedInCombo)) {
- // Path has not changed. No need to reload.
- return;
- }
-
- // Get all the files at the new path
-
- TreeSet
filePaths = mFolderCache.get(newPath); - - if (filePaths == null) { - filePaths = new TreeSet (); - - IFolder folder = mProject.getFolder(newPath); - if (folder != null && folder.exists()) { - try { - for (IResource res : folder.members()) { - String name = res.getName(); - if (res.getType() == IResource.FILE && name.endsWith(".xml")) { - filePaths.add(newPath + name); - } - } - } catch (CoreException e) { - // Ignore. - } - } - - mFolderCache.put(newPath, filePaths); - } - - currPath = newPath + leafName; - if (leafName.length() > 0 && !filePaths.contains(currPath)) { - filePaths.add(currPath); - } - - // Fill the combo - try { - mInternalFileComboChange = true; - - mResFileCombo.removeAll(); - - for (String filePath : filePaths) { - mResFileCombo.add(filePath); - } - - int index = -1; - if (leafName.length() > 0) { - index = mResFileCombo.indexOf(currPath); - if (index >= 0) { - mResFileCombo.select(index); - } - } - - if (index == -1) { - mResFileCombo.setText(currPath); - } - - mLastFolderUsedInCombo = newPath; - - } finally { - mInternalFileComboChange = false; - } - - // finally validate the whole page - validatePage(); - } - - /** - * Callback invoked when {@link ExtractStringInputPage#mResFileCombo} has been - * modified. - */ - public void modifyText(ModifyEvent e) { - if (mInternalFileComboChange) { - return; - } - - String wsFolderPath = mResFileCombo.getText(); - - // This is a custom path, we need to sanitize it. - // First it should start with "/res/". Then we need to make sure there are no - // relative paths, things like "../" or "./" or even "//". - wsFolderPath = wsFolderPath.replaceAll("/+\\.\\./+|/+\\./+|//+|\\\\+|^/+", "/"); //$NON-NLS-1$ //$NON-NLS-2$ - wsFolderPath = wsFolderPath.replaceAll("^\\.\\./+|^\\./+", ""); //$NON-NLS-1$ //$NON-NLS-2$ - wsFolderPath = wsFolderPath.replaceAll("/+\\.\\.$|/+\\.$|/+$", ""); //$NON-NLS-1$ //$NON-NLS-2$ - - // We get "res/foo" from selections relative to the project when we want a "/res/foo" path. - if (wsFolderPath.startsWith(RES_FOLDER_REL)) { - wsFolderPath = RES_FOLDER_ABS + wsFolderPath.substring(RES_FOLDER_REL.length()); - - mInternalFileComboChange = true; - mResFileCombo.setText(wsFolderPath); - mInternalFileComboChange = false; - } - - if (wsFolderPath.startsWith(RES_FOLDER_ABS)) { - wsFolderPath = wsFolderPath.substring(RES_FOLDER_ABS.length()); - - int pos = wsFolderPath.indexOf(AndroidConstants.WS_SEP_CHAR); - if (pos >= 0) { - wsFolderPath = wsFolderPath.substring(0, pos); - } - - String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP); - - if (folderSegments.length > 0) { - String folderName = folderSegments[0]; - - if (folderName != null && !folderName.equals(wsFolderPath)) { - // update config selector - mInternalConfigChange = true; - mConfigSelector.setConfiguration(folderSegments); - mInternalConfigChange = false; - } - } - } - - validatePage(); - } - } - } diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java index 430ff1819..a17d81790 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.refactorings.extractstring; +import com.android.ide.eclipse.adt.wizards.newstring.NewStringHelper; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; -import com.android.ide.eclipse.common.project.AndroidXPathFactory; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -64,8 +64,6 @@ import org.eclipse.text.edits.MultiTextEdit; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; import org.eclipse.text.edits.TextEditGroup; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; import java.io.BufferedReader; import java.io.IOException; @@ -73,14 +71,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; - /** * This refactoring extracts a string from a file and replaces it by an Android resource ID * such as R.string.foo. @@ -105,8 +98,8 @@ import javax.xml.xpath.XPathExpressionException; * - On success, the wizard is shown, which let the user input the new ID to use. *
- The wizard sets the user input values into this refactoring instance, e.g. the new string * ID, the XML file to update, etc. The wizard does use the utility method - * {@link #isResIdDuplicate(String, String)} to check whether the new ID is already defined - * in the target XML file. + * {@link NewStringHelper#isResIdDuplicate(IProject, String, String)} to check whether the new + * ID is already defined in the target XML file. *
- Once Preview or Finish is selected in the wizard, the * {@link #checkFinalConditions(IProgressMonitor)} is called to double-check the user input * and compute the actual changes. @@ -127,60 +120,106 @@ import javax.xml.xpath.XPathExpressionException; *
- TODO: Have a pref in the wizard: [x] Change other Java Files *
-
+ *
- Examine the current file name to retrieve the XML filename, if any. + *
- Recompute the path based on the configuration selector (e.g. /res/values-fr/). + *
- Examine the path to retrieve all the files in it. Keep those in a local cache. + *
- If the XML filename from step 1 is not in the file list, it's a custom file name. + * Insert it and sort it. + *
- Re-populate the file combo with all the choices. + *
- Select the original XML file.
+ */
+ public void run() {
+ if (mInternalConfigChange) {
+ return;
+ }
+
+ // get current leafname, if any
+ String leafName = ""; //$NON-NLS-1$
+ String currPath = mResFileCombo.getText();
+ Matcher m = mPathRegex.matcher(currPath);
+ if (m.matches()) {
+ // Note: groups 1 and 2 cannot be null.
+ leafName = m.group(2);
+ currPath = m.group(1);
+ } else {
+ // There was a path but it was invalid. Ignore it.
+ currPath = ""; //$NON-NLS-1$
+ }
+
+ // recreate the res path from the current configuration
+ mConfigSelector.getConfiguration(mTempConfig);
+ StringBuffer sb = new StringBuffer(RES_FOLDER_ABS);
+ sb.append(mTempConfig.getFolderName(ResourceFolderType.VALUES));
+ sb.append('/');
+
+ String newPath = sb.toString();
+ if (newPath.equals(currPath) && newPath.equals(mLastFolderUsedInCombo)) {
+ // Path has not changed. No need to reload.
+ return;
+ }
+
+ // Get all the files at the new path
+
+ TreeSet
filePaths = mFolderCache.get(newPath); + + if (filePaths == null) { + filePaths = new TreeSet (); + + IFolder folder = mProject.getFolder(newPath); + if (folder != null && folder.exists()) { + try { + for (IResource res : folder.members()) { + String name = res.getName(); + if (res.getType() == IResource.FILE && name.endsWith(".xml")) { //$NON-NLS-1$ + filePaths.add(newPath + name); + } + } + } catch (CoreException e) { + // Ignore. + } + } + + mFolderCache.put(newPath, filePaths); + } + + currPath = newPath + leafName; + if (leafName.length() > 0 && !filePaths.contains(currPath)) { + filePaths.add(currPath); + } + + // Fill the combo + try { + mInternalFileComboChange = true; + + mResFileCombo.removeAll(); + + for (String filePath : filePaths) { + mResFileCombo.add(filePath); + } + + int index = -1; + if (leafName.length() > 0) { + index = mResFileCombo.indexOf(currPath); + if (index >= 0) { + mResFileCombo.select(index); + } + } + + if (index == -1) { + mResFileCombo.setText(currPath); + } + + mLastFolderUsedInCombo = newPath; + + } finally { + mInternalFileComboChange = false; + } + + // finally validate the whole page + validatePage(); + } + + /** + * Callback invoked when {@link NewStringBaseImpl#mResFileCombo} has been + * modified. + */ + public void modifyText(ModifyEvent e) { + if (mInternalFileComboChange) { + return; + } + + String wsFolderPath = mResFileCombo.getText(); + + // This is a custom path, we need to sanitize it. + // First it should start with "/res/". Then we need to make sure there are no + // relative paths, things like "../" or "./" or even "//". + wsFolderPath = wsFolderPath.replaceAll("/+\\.\\./+|/+\\./+|//+|\\\\+|^/+", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + wsFolderPath = wsFolderPath.replaceAll("^\\.\\./+|^\\./+", ""); //$NON-NLS-1$ //$NON-NLS-2$ + wsFolderPath = wsFolderPath.replaceAll("/+\\.\\.$|/+\\.$|/+$", ""); //$NON-NLS-1$ //$NON-NLS-2$ + + // We get "res/foo" from selections relative to the project when we want a "/res/foo" path. + if (wsFolderPath.startsWith(RES_FOLDER_REL)) { + wsFolderPath = RES_FOLDER_ABS + wsFolderPath.substring(RES_FOLDER_REL.length()); + + mInternalFileComboChange = true; + mResFileCombo.setText(wsFolderPath); + mInternalFileComboChange = false; + } + + if (wsFolderPath.startsWith(RES_FOLDER_ABS)) { + wsFolderPath = wsFolderPath.substring(RES_FOLDER_ABS.length()); + + int pos = wsFolderPath.indexOf(AndroidConstants.WS_SEP_CHAR); + if (pos >= 0) { + wsFolderPath = wsFolderPath.substring(0, pos); + } + + String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP); + + if (folderSegments.length > 0) { + String folderName = folderSegments[0]; + + if (folderName != null && !folderName.equals(wsFolderPath)) { + // update config selector + mInternalConfigChange = true; + mConfigSelector.setConfiguration(folderSegments); + mInternalConfigChange = false; + } + } + } + + validatePage(); + } + } +} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java new file mode 100644 index 000000000..3b8392718 --- /dev/null +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.eclipse.org/org/documents/epl-v10.php + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ide.eclipse.adt.wizards.newstring; + +import com.android.ide.eclipse.common.project.AndroidXPathFactory; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; + +import java.util.HashMap; +import java.util.HashSet; + +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathConstants; +import javax.xml.xpath.XPathExpressionException; + +/** + * + */ +public class NewStringHelper { + + /** A temporary cache of R.string IDs defined by a given xml file. The key is the + * project path of the file, the data is a set of known string Ids for that file. */ + private HashMap cache = mResIdCache.get(xmlFileWsPath); + if (cache == null) { + cache = getResIdsForFile(project, xmlFileWsPath); + mResIdCache.put(xmlFileWsPath, cache); + } + + return cache.contains(stringId); + } + + /** + * Extract all the defined string IDs from a given file using XPath. + * @param project The project contain the XML file. + * @param xmlFileWsPath The project path of the file to parse. It may not exist. + * @return The set of all string IDs defined in the file. The returned set is always non + * null. It is empty if the file does not exist. + */ + private HashSet getResIdsForFile(IProject project, String xmlFileWsPath) { + HashSet ids = new HashSet (); + + if (mXPath == null) { + mXPath = AndroidXPathFactory.newXPath(); + } + + // Access the project that contains the resource that contains the compilation unit + IResource resource = project.getFile(xmlFileWsPath); + + if (resource != null && resource.exists() && resource.getType() == IResource.FILE) { + InputSource source; + try { + source = new InputSource(((IFile) resource).getContents()); + + // We want all the IDs in an XML structure like this: + // + // + + String xpathExpr = "/resources/string/@name"; //$NON-NLS-1$ + + Object result = mXPath.evaluate(xpathExpr, source, XPathConstants.NODESET); + if (result instanceof NodeList) { + NodeList list = (NodeList) result; + for (int n = list.getLength() - 1; n >= 0; n--) { + String id = list.item(n).getNodeValue(); + ids.add(id); + } + } + + } catch (CoreException e1) { + // IFile.getContents failed. Ignore. + } catch (XPathExpressionException e) { + // mXPath.evaluate failed. Ignore. + } + } + + return ids; + } + +} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java new file mode 100644 index 000000000..f7d8fe863 --- /dev/null +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.eclipse.org/org/documents/epl-v10.php + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ide.eclipse.adt.wizards.newstring; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.wizard.Wizard; + +/** + * + */ +public class NewStringWizard extends Wizard { + + protected static final String MAIN_PAGE_NAME = "newXmlStringPage"; //$NON-NLS-1$ + + private NewStringWizardPage mMainPage; + + public NewStringWizard(IProject project) { + super(); + + mMainPage = createMainPage(project); + } + + /** + * Creates the wizard page. + * + * Please do NOT override this method. + * + * This is protected so that it can be overridden by unit tests. + * However the contract of this class is private and NO ATTEMPT will be made + * to maintain compatibility between different versions of the plugin. + * @param project + */ + protected NewStringWizardPage createMainPage(IProject project) { + return new NewStringWizardPage(project, MAIN_PAGE_NAME); + } + + @Override + public void addPages() { + addPage(mMainPage); + super.addPages(); + } + + /** + * @see org.eclipse.jface.wizard.Wizard#performFinish() + */ + @Override + public boolean performFinish() { + // pass + return false; + } + +} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java new file mode 100644 index 000000000..1e2d27277 --- /dev/null +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Eclipse Public License, Version 1.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.eclipse.org/org/documents/epl-v10.php + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ide.eclipse.adt.wizards.newstring; + +import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.INewStringPageCallback; +import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.ValidationStatus; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; + +/** + * + */ +class NewStringWizardPage extends WizardPage implements INewStringPageCallback { + + private NewStringBaseImpl mImpl; + + /** Field displaying the user-selected string to be replaced. */ + private Label mStringValueField; + + private String mNewStringId; + + public NewStringWizardPage(IProject project, String pageName) { + super(pageName); + mImpl = new NewStringBaseImpl(project, this); + } + + public String getNewStringValue() { + return mStringValueField.getText(); + } + + public String getNewStringId() { + return mNewStringId; + } + + public String getResFilePathProjPath() { + return mImpl.getResFileProjPath(); + } + + /** + * Create the UI for the new string wizard. + */ + public void createControl(Composite parent) { + Composite content = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + content.setLayout(layout); + + mImpl.createControl(content); + setControl(content); + } + + /** + * Creates the top group with the field to replace which string and by what + * and by which options. + * + * @param content A composite with a 1-column grid layout + * @return The {@link Text} field for the new String ID name. + */ + public Text createStringGroup(Composite content) { + + Group group = new Group(content, SWT.NONE); + group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + group.setText("New String"); + + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + group.setLayout(layout); + + Label label = new Label(group, SWT.NONE); + label.setText("String:"); + + mStringValueField = new Label(group, SWT.NONE); + mStringValueField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + mStringValueField.setText(""); //$NON-NLS-1$ + + // TODO provide an option to refactor all known occurences of this string. + + // line : Textfield for new ID + + label = new Label(group, SWT.NONE); + label.setText("Replace by R.string."); + + final Text stringIdField = new Text(group, SWT.SINGLE | SWT.LEFT | SWT.BORDER); + stringIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + stringIdField.setText(""); + + mNewStringId = stringIdField.getText().trim(); + + stringIdField.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + if (mImpl.validatePage()) { + mNewStringId = stringIdField.getText().trim(); + } + } + }); + + return stringIdField; + } + + public void postValidatePage(ValidationStatus status) { + // pass + } +} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java index 654e792cc..56bb8f492 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java @@ -144,7 +144,9 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { return dlg.getCurrentResource(); } } else { - ReferenceChooserDialog dlg = new ReferenceChooserDialog(projectRepository, + ReferenceChooserDialog dlg = new ReferenceChooserDialog( + project, + projectRepository, shell); dlg.setCurrentResource(currentValue); From 979e0dc0c5d788309b2ae2e4e8882aa7fbfc6ef6 Mon Sep 17 00:00:00 2001 From: Brett Chabot <> Date: Thu, 2 Apr 2009 15:36:04 -0700 Subject: [PATCH 23/45] AI 144320: ADT: Fix debugger launch connection when debugging Android JUnit BUG=1753089 Automated import of CL 144320 --- .../adt/launch/AndroidLaunchController.java | 12 +++-- .../eclipse/adt/launch/DelayedLaunchInfo.java | 20 +++++++- .../adt/launch/LaunchConfigDelegate.java | 7 +-- .../junit/AndroidJUnitLaunchAction.java | 1 - .../AndroidJUnitLaunchConfigDelegate.java | 41 +++++++++++++--- .../AndroidJUnitLaunchConfigurationTab.java | 2 +- .../junit/InstrumentationRunnerValidator.java | 19 ++++--- .../common/project/AndroidManifestParser.java | 49 +++++++++++++++---- .../project/AndroidManifestParserTest.java | 16 +++--- 9 files changed, 124 insertions(+), 43 deletions(-) diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java index b6c7640c7..655c038e1 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java @@ -314,6 +314,8 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener * defined bysomething + //ILaunchManager-RUN_MODEor *DEBUG_MODE. * @param apk the resource to the apk to launch. + * @param packageName the Android package name of the app + * @param debugPackageName the Android package name to debug * @param debuggable the debuggable value of the app, or null if not set. * @param requiredApiVersionNumber the api version required by the app, or * {@link AndroidManifestParser#INVALID_MIN_SDK} if none. @@ -322,7 +324,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener * @param launch the launch object */ public void launch(final IProject project, String mode, IFile apk, - String packageName, Boolean debuggable, int requiredApiVersionNumber, + String packageName, String debugPackageName, Boolean debuggable, int requiredApiVersionNumber, final IAndroidLaunchAction launchAction, final AndroidLaunchConfiguration config, final AndroidLaunch launch, IProgressMonitor monitor) { @@ -331,7 +333,8 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener // create the launch info final DelayedLaunchInfo launchInfo = new DelayedLaunchInfo(project, packageName, - launchAction, apk, debuggable, requiredApiVersionNumber, launch, monitor); + debugPackageName, launchAction, apk, debuggable, requiredApiVersionNumber, launch, + monitor); // set the debug mode launchInfo.setDebugMode(mode.equals(ILaunchManager.DEBUG_MODE)); @@ -922,6 +925,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener DelayedLaunchInfo delayedLaunchInfo = new DelayedLaunchInfo( androidProject.getProject(), manifestParser.getPackage(), + manifestParser.getPackage(), launchInfo.getLaunchAction(), apk, manifestParser.getDebuggable(), @@ -1524,14 +1528,14 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener for (int i = 0; i < mWaitingForDebuggerApplications.size(); ) { final DelayedLaunchInfo launchInfo = mWaitingForDebuggerApplications.get(i); if (client.getDevice() == launchInfo.getDevice() && - applicationName.equals(launchInfo.getPackageName())) { + applicationName.equals(launchInfo.getDebugPackageName())) { // this is a match. We remove the launch info from the list mWaitingForDebuggerApplications.remove(i); // and connect the debugger. String msg = String.format( "Attempting to connect debugger to '%1$s' on port %2$d", - launchInfo.getPackageName(), client.getDebuggerListenPort()); + launchInfo.getDebugPackageName(), client.getDebuggerListenPort()); AdtPlugin.printToConsole(launchInfo.getProject(), msg); new Thread("Debugger Connection") { //$NON-NLS-1$ diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DelayedLaunchInfo.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DelayedLaunchInfo.java index 7dae56d00..f3bd28a07 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DelayedLaunchInfo.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DelayedLaunchInfo.java @@ -44,6 +44,9 @@ public final class DelayedLaunchInfo { /** Package name */ private final String mPackageName; + + /** Debug package name */ + private final String mDebugPackageName; /** IFile to the package (.apk) file */ private final IFile mPackageFile; @@ -79,7 +82,8 @@ public final class DelayedLaunchInfo { * Basic constructor with activity and package info. * * @param project the eclipse project that corresponds to Android app - * @param packageName package name of Android app + * @param packageName package name of Android app + * @param debugPackageName the package name of the Andriod app to debug * @param launchAction action to perform after app install * @param pack IFile to the package (.apk) file * @param debuggable debuggable attribute of the app's manifest file. @@ -88,11 +92,12 @@ public final class DelayedLaunchInfo { * @param launch the launch object * @param monitor progress monitor for launch */ - public DelayedLaunchInfo(IProject project, String packageName, + public DelayedLaunchInfo(IProject project, String packageName, String debugPackageName, IAndroidLaunchAction launchAction, IFile pack, Boolean debuggable, int requiredApiVersionNumber, AndroidLaunch launch, IProgressMonitor monitor) { mProject = project; mPackageName = packageName; + mDebugPackageName = debugPackageName; mPackageFile = pack; mLaunchAction = launchAction; mLaunch = launch; @@ -129,6 +134,17 @@ public final class DelayedLaunchInfo { return mPackageName; } + /** + * Returns the Android app process name that the debugger should connect to. Typically this is + * the same value as {@link getPackageName} + */ + public String getDebugPackageName() { + if (mDebugPackageName == null) { + return getPackageName(); + } + return mDebugPackageName; + } + /** * @return the application package file */ diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java index d057ac709..9f12b16e4 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java @@ -306,9 +306,10 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { // everything seems fine, we ask the launch controller to handle // the rest - controller.launch(project, mode, applicationPackage, manifestParser.getPackage(), - manifestParser.getDebuggable(), manifestParser.getApiLevelRequirement(), - launchAction, config, androidLaunch, monitor); + controller.launch(project, mode, applicationPackage,manifestParser.getPackage(), + manifestParser.getPackage(), manifestParser.getDebuggable(), + manifestParser.getApiLevelRequirement(), launchAction, config, androidLaunch, + monitor); } @Override diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java index 9bcc63d06..24ebe21c0 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java @@ -63,7 +63,6 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction { try { mLaunchInfo.setDebugMode(info.isDebugMode()); mLaunchInfo.setDevice(info.getDevice()); - mLaunchInfo.setLaunch(info.getLaunch()); JUnitLaunchDelegate junitDelegate = new JUnitLaunchDelegate(mLaunchInfo); final String mode = info.isDebugMode() ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE; diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigDelegate.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigDelegate.java index 543daf06f..19067921b 100755 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigDelegate.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigDelegate.java @@ -25,6 +25,7 @@ import com.android.ide.eclipse.adt.launch.LaunchConfigDelegate; import com.android.ide.eclipse.adt.launch.junit.runtime.AndroidJUnitLaunchInfo; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; +import com.android.ide.eclipse.common.project.AndroidManifestParser.Instrumentation; import com.android.ide.eclipse.common.project.BaseProjectHelper; import org.eclipse.core.resources.IFile; @@ -60,7 +61,6 @@ public class AndroidJUnitLaunchConfigDelegate extends LaunchConfigDelegate { AndroidLaunchConfiguration config, AndroidLaunchController controller, IFile applicationPackage, AndroidManifestParser manifestParser) { - String appPackage = manifestParser.getPackage(); String runner = getRunner(project, configuration, manifestParser); if (runner == null) { AdtPlugin.displayError("Android Launch", @@ -68,19 +68,46 @@ public class AndroidJUnitLaunchConfigDelegate extends LaunchConfigDelegate { androidLaunch.stopLaunch(); return; } - AndroidJUnitLaunchInfo junitLaunchInfo = new AndroidJUnitLaunchInfo(project, appPackage, - runner); + // get the target app's package + String targetAppPackage = getTargetPackage(manifestParser, runner); + if (targetAppPackage == null) { + AdtPlugin.displayError("Android Launch", + String.format("A target package for instrumention test runner %1$s could not be found!", + runner)); + androidLaunch.stopLaunch(); + return; + } + String testAppPackage = manifestParser.getPackage(); + AndroidJUnitLaunchInfo junitLaunchInfo = new AndroidJUnitLaunchInfo(project, + testAppPackage, runner); junitLaunchInfo.setTestClass(getTestClass(configuration)); junitLaunchInfo.setTestPackage(getTestPackage(configuration)); junitLaunchInfo.setTestMethod(getTestMethod(configuration)); - + junitLaunchInfo.setLaunch(androidLaunch); IAndroidLaunchAction junitLaunch = new AndroidJUnitLaunchAction(junitLaunchInfo); - - controller.launch(project, mode, applicationPackage, manifestParser.getPackage(), + + controller.launch(project, mode, applicationPackage, testAppPackage, targetAppPackage, manifestParser.getDebuggable(), manifestParser.getApiLevelRequirement(), junitLaunch, config, androidLaunch, monitor); } - + + /** + * Get the target Android application's package for the given instrumentation runner, or + *nullif it could not be found. + * + * @param manifestParser the {@link AndroidManifestParser} for the test project + * @param runner the instrumentation runner class name + * @return the target package ornull+ */ + private String getTargetPackage(AndroidManifestParser manifestParser, String runner) { + for (Instrumentation instr : manifestParser.getInstrumentations()) { + if (instr.getName().equals(runner)) { + return instr.getTargetPackage(); + } + } + return null; + } + /** * Returns the test package stored in the launch configuration, ornullif not * specified. diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java index 584d45eb1..34e64e327 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchConfigurationTab.java @@ -955,7 +955,7 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat try { mInstrValidator = new InstrumentationRunnerValidator(project); mInstrumentations = (mInstrValidator == null ? null : - mInstrValidator.getInstrumentations()); + mInstrValidator.getInstrumentationNames()); if (mInstrumentations != null) { mInstrumentationCombo.removeAll(); for (String instrumentation : mInstrumentations) { diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/InstrumentationRunnerValidator.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/InstrumentationRunnerValidator.java index f22fc7cda..7ebbb0997 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/InstrumentationRunnerValidator.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/InstrumentationRunnerValidator.java @@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.launch.junit; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; +import com.android.ide.eclipse.common.project.AndroidManifestParser.Instrumentation; import com.android.ide.eclipse.common.project.BaseProjectHelper; import org.eclipse.core.resources.IProject; @@ -29,7 +30,7 @@ import org.eclipse.jdt.core.IJavaProject; */ class InstrumentationRunnerValidator { private final IJavaProject mJavaProject; - private String[] mInstrumentations = null; + private String[] mInstrumentationNames = null; private boolean mHasRunnerLibrary = false; static final String INSTRUMENTATION_OK = null; @@ -73,7 +74,11 @@ class InstrumentationRunnerValidator { } private void init(AndroidManifestParser manifestParser) { - mInstrumentations = manifestParser.getInstrumentations(); + Instrumentation[] instrumentations = manifestParser.getInstrumentations(); + mInstrumentationNames = new String[instrumentations.length]; + for (int i = 0; i < instrumentations.length; i++) { + mInstrumentationNames[i] = instrumentations[i].getName(); + } mHasRunnerLibrary = hasTestRunnerLibrary(manifestParser); } @@ -94,13 +99,13 @@ class InstrumentationRunnerValidator { } /** - * Return the set of instrumentations for the Android project. + * Return the set of instrumentation names for the Android project. * * @returnnullINSTRUMENTATION_OK if valid, otherwise returns error message */ String validateInstrumentationRunner(String instrumentation) { diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java index 85ba96839..f853adacb 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java @@ -52,6 +52,7 @@ public class AndroidManifestParser { private final static String ATTRIBUTE_PROCESS = "process"; //$NON-NLS-$ private final static String ATTRIBUTE_DEBUGGABLE = "debuggable"; //$NON-NLS-$ private final static String ATTRIBUTE_MIN_SDK_VERSION = "minSdkVersion"; //$NON-NLS-$ + private final static String ATTRIBUTE_TARGET_PACKAGE = "targetPackage"; //$NON-NLS-1$ private final static String NODE_MANIFEST = "manifest"; //$NON-NLS-1$ private final static String NODE_APPLICATION = "application"; //$NON-NLS-1$ private final static String NODE_ACTIVITY = "activity"; //$NON-NLS-1$ @@ -76,6 +77,33 @@ public class AndroidManifestParser { public final static int INVALID_MIN_SDK = -1; + /** + * Instrumentation info obtained from manifest + */ + public static class Instrumentation { + private final String mName; + private final String mTargetPackage; + + public Instrumentation(String name, String targetPackage) { + mName = name; + mTargetPackage = targetPackage; + } + + /** + * Returns the fully qualified instrumentation class name + */ + public String getName() { + return mName; + } + + /** + * Returns the Android app package that is the target of this instrumentation + */ + public String getTargetPackage() { + return mTargetPackage; + } + } + /** * XML error & data handler used when parsing the AndroidManifest.xml file. * @@ -100,7 +128,8 @@ public class AndroidManifestParser { * the attribute was not present. */ private int mApiLevelRequirement = INVALID_MIN_SDK; /** List of all instrumentations declared by the manifest */ - private final ArrayListmInstrumentations = new ArrayList (); + private final ArrayList mInstrumentations = + new ArrayList (); /** List of all libraries in use declared by the manifest */ private final ArrayList mLibraries = new ArrayList (); @@ -185,11 +214,11 @@ public class AndroidManifestParser { /** * Returns the list of instrumentations found in the manifest. - * @return An array of instrumentation names, or empty if no instrumentations were + * @return An array of {@link Instrumentation}, or empty if no instrumentations were * found. */ - String[] getInstrumentations() { - return mInstrumentations.toArray(new String[mInstrumentations.size()]); + Instrumentation[] getInstrumentations() { + return mInstrumentations.toArray(new Instrumentation[mInstrumentations.size()]); } /** @@ -459,7 +488,9 @@ public class AndroidManifestParser { true /* hasNamespace */); if (instrumentationName != null) { String instrClassName = combinePackageAndClassName(mPackage, instrumentationName); - mInstrumentations.add(instrClassName); + String targetPackage = getAttributeValue(attributes, ATTRIBUTE_TARGET_PACKAGE, + true /* hasNamespace */); + mInstrumentations.add(new Instrumentation(instrClassName, targetPackage)); if (mMarkErrors) { checkClass(instrClassName, AndroidConstants.CLASS_INSTRUMENTATION, true /* testVisibility */); @@ -544,7 +575,7 @@ public class AndroidManifestParser { private final String[] mProcesses; private final Boolean mDebuggable; private final int mApiLevelRequirement; - private final String[] mInstrumentations; + private final Instrumentation[] mInstrumentations; private final String[] mLibraries; static { @@ -819,9 +850,9 @@ public class AndroidManifestParser { /** * Returns the list of instrumentations found in the manifest. - * @return An array of fully qualified class names, or empty if no instrumentations were found. + * @return An array of {@link Instrumentation}, or empty if no instrumentations were found. */ - public String[] getInstrumentations() { + public Instrumentation[] getInstrumentations() { return mInstrumentations; } @@ -851,7 +882,7 @@ public class AndroidManifestParser { */ private AndroidManifestParser(String javaPackage, String[] activities, String launcherActivity, String[] processes, Boolean debuggable, - int apiLevelRequirement, String[] instrumentations, String[] libraries) { + int apiLevelRequirement, Instrumentation[] instrumentations, String[] libraries) { mJavaPackage = javaPackage; mActivities = activities; mLauncherActivity = launcherActivity; diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java index 7e8b0af10..2f93e5179 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/common/project/AndroidManifestParserTest.java @@ -33,7 +33,7 @@ public class AndroidManifestParserTest extends TestCase { private static final String ACTIVITY_NAME = "com.android.testapp.MainActivity"; //$NON-NLS-1$ private static final String LIBRARY_NAME = "android.test.runner"; //$NON-NLS-1$ private static final String INSTRUMENTATION_NAME = "android.test.InstrumentationTestRunner"; //$NON-NLS-1$ - + private static final String INSTRUMENTATION_TARGET = "com.android.AndroidProject"; //$NON-NLS-1$ @Override protected void setUp() throws Exception { super.setUp(); @@ -51,7 +51,10 @@ public class AndroidManifestParserTest extends TestCase { public void testGetInstrumentationInformation() { assertEquals(1, mManifestInstrumentation.getInstrumentations().length); - assertEquals(INSTRUMENTATION_NAME, mManifestTestApp.getInstrumentations()[0]); + assertEquals(INSTRUMENTATION_NAME, + mManifestInstrumentation.getInstrumentations()[0].getName()); + assertEquals(INSTRUMENTATION_TARGET, + mManifestInstrumentation.getInstrumentations()[0].getTargetPackage()); } public void testGetPackage() { @@ -66,17 +69,12 @@ public class AndroidManifestParserTest extends TestCase { public void testGetLauncherActivity() { assertEquals(ACTIVITY_NAME, mManifestTestApp.getLauncherActivity()); } - + public void testGetUsesLibraries() { assertEquals(1, mManifestTestApp.getUsesLibraries().length); assertEquals(LIBRARY_NAME, mManifestTestApp.getUsesLibraries()[0]); } - - public void testGetInstrumentations() { - assertEquals(1, mManifestTestApp.getInstrumentations().length); - assertEquals(INSTRUMENTATION_NAME, mManifestTestApp.getInstrumentations()[0]); - } - + public void testGetPackageName() { assertEquals(PACKAGE_NAME, mManifestTestApp.getPackage()); } From c203e2112305c3ebd9361ef9084ce2c8b2c6ad3a Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 16:39:19 -0700 Subject: [PATCH 24/45] AI 144335: Import US Spanish translations, and a few Japanese changes. Automated import of CL 144335 --- apps/Fallback/res/values-es-rUS/strings.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 apps/Fallback/res/values-es-rUS/strings.xml diff --git a/apps/Fallback/res/values-es-rUS/strings.xml b/apps/Fallback/res/values-es-rUS/strings.xml new file mode 100644 index 000000000..0ce57511e --- /dev/null +++ b/apps/Fallback/res/values-es-rUS/strings.xml @@ -0,0 +1,21 @@ + + + + From d1bc5b4177c39d0e86127531e665f68ece1fb40d Mon Sep 17 00:00:00 2001 From: Eric Fischer <> Date: Thu, 2 Apr 2009 21:42:02 -0700 Subject: [PATCH 25/45] AI 144355: Automated g4 rollback of changelist 144335. *** Reason for rollback *** Roll back US Spanish import because it made the build too big. *** Original change description *** Import US Spanish translations, and a few Japanese changes. Automated import of CL 144355 --- apps/Fallback/res/values-es-rUS/strings.xml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 apps/Fallback/res/values-es-rUS/strings.xml diff --git a/apps/Fallback/res/values-es-rUS/strings.xml b/apps/Fallback/res/values-es-rUS/strings.xml deleted file mode 100644 index 0ce57511e..000000000 --- a/apps/Fallback/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - -"Fallback" +"Acción no admitida" +"Esa acción no se admite actualmente." +- From 01cdf8fe24f694b7382c978bf246982277bad209 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet <> Date: Thu, 2 Apr 2009 21:44:15 -0700 Subject: [PATCH 26/45] AI 144366: Activity Launcher filters out unlauncheable activity (bug #1736754) Activities that do not have an action, or that are set to not be exported cannot be launched from 'am start...' so they should not be considered when finding an activity to launch. BUG=1736754 Automated import of CL 144366 --- .../adt/launch/AndroidLaunchController.java | 8 +- .../adt/launch/LaunchConfigDelegate.java | 24 +++- .../adt/launch/MainLaunchConfigTab.java | 37 +++-- .../newproject/NewProjectCreationPage.java | 17 ++- .../common/project/AndroidManifestParser.java | 127 +++++++++++++----- 5 files changed, 144 insertions(+), 69 deletions(-) diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java index 655c038e1..7ee3def57 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java @@ -1078,7 +1078,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener /** * Performs the installation of an application whose package has been uploaded on the device. - * Before doing it, if the application is already running on the device, it is killed. + * * @param launchInfo the {@link DelayedLaunchInfo}. * @param remotePath the path of the application package in the device tmp folder. * @param device the device on which to install the application. @@ -1088,12 +1088,6 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener */ private String doInstall(DelayedLaunchInfo launchInfo, final String remotePath, final IDevice device, boolean reinstall) throws IOException { - // kill running application - Client application = device.getClient(launchInfo.getPackageName()); - if (application != null) { - application.kill(); - } - InstallReceiver receiver = new InstallReceiver(); try { String cmd = String.format( diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java index 9f12b16e4..4fa270e4e 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/LaunchConfigDelegate.java @@ -23,6 +23,7 @@ import com.android.ide.eclipse.adt.project.ProjectHelper; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; import com.android.ide.eclipse.common.project.BaseProjectHelper; +import com.android.ide.eclipse.common.project.AndroidManifestParser.Activity; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -247,7 +248,7 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { activityName = getActivityName(configuration); // Get the full activity list and make sure the one we got matches. - String[] activities = manifestParser.getActivities(); + Activity[] activities = manifestParser.getActivities(); // first we check that there are, in fact, activities. if (activities.length == 0) { @@ -261,8 +262,11 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { // if the activity we got is null, we look for the default one. AdtPlugin.printErrorToConsole(project, "No activity specified! Getting the launcher activity."); - activityName = manifestParser.getLauncherActivity(); - + Activity launcherActivity = manifestParser.getLauncherActivity(); + if (launcherActivity != null) { + activityName = launcherActivity.getName(); + } + // if there's no default activity. We revert to a sync-only launch. if (activityName == null) { revertToNoActionLaunch(project, config); @@ -271,8 +275,8 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { // check the one we got from the config matches any from the list boolean match = false; - for (String a : activities) { - if (a != null && a.equals(activityName)) { + for (Activity a : activities) { + if (a != null && a.getName().equals(activityName)) { match = true; break; } @@ -282,7 +286,10 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { if (match == false) { AdtPlugin.printErrorToConsole(project, "The specified activity does not exist! Getting the launcher activity."); - activityName = manifestParser.getLauncherActivity(); + Activity launcherActivity = manifestParser.getLauncherActivity(); + if (launcherActivity != null) { + activityName = launcherActivity.getName(); + } // if there's no default activity. We revert to a sync-only launch. if (activityName == null) { @@ -291,7 +298,10 @@ public class LaunchConfigDelegate extends LaunchConfigurationDelegate { } } } else if (config.mLaunchAction == ACTION_DEFAULT) { - activityName = manifestParser.getLauncherActivity(); + Activity launcherActivity = manifestParser.getLauncherActivity(); + if (launcherActivity != null) { + activityName = launcherActivity.getName(); + } // if there's no default activity. We revert to a sync-only launch. if (activityName == null) { diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/MainLaunchConfigTab.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/MainLaunchConfigTab.java index 91bd21cb7..a32c2ee0e 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/MainLaunchConfigTab.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/MainLaunchConfigTab.java @@ -20,6 +20,7 @@ import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.common.project.AndroidManifestParser; import com.android.ide.eclipse.common.project.BaseProjectHelper; import com.android.ide.eclipse.common.project.ProjectChooserHelper; +import com.android.ide.eclipse.common.project.AndroidManifestParser.Activity; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -50,6 +51,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; +import java.util.ArrayList; + /** * Class for the main launch configuration tab. */ @@ -66,7 +69,7 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab { private Button mProjButton; private Combo mActivityCombo; - private String[] mActivities; + private final ArrayList"Fallback" -"Acción no admitida" -"Esa acción no se admite actualmente." -mActivities = new ArrayList (); private WidgetListener mListener = new WidgetListener(); @@ -214,8 +217,9 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab { // add the activity int selection = mActivityCombo.getSelectionIndex(); - if (mActivities != null && selection >=0 && selection < mActivities.length) { - configuration.setAttribute(LaunchConfigDelegate.ATTR_ACTIVITY, mActivities[selection]); + if (mActivities != null && selection >=0 && selection < mActivities.size()) { + configuration.setAttribute(LaunchConfigDelegate.ATTR_ACTIVITY, + mActivities.get(selection).getName()); } // link the project and the launch config. @@ -349,11 +353,11 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab { mActivityCombo.setEnabled(true); if (activityName == null || activityName.equals(EMPTY_STRING)) { mActivityCombo.clearSelection(); - } else if (mActivities != null && mActivities.length > 0) { + } else if (mActivities != null && mActivities.size() > 0) { // look for the name of the activity in the combo. boolean found = false; - for (int i = 0 ; i < mActivities.length ; i++) { - if (activityName.equals(mActivities[i])) { + for (int i = 0 ; i < mActivities.size() ; i++) { + if (activityName.equals(mActivities.get(i).getName())) { found = true; mActivityCombo.select(i); break; @@ -404,17 +408,22 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab { BaseProjectHelper.getJavaProject(project), null /* errorListener */, true /* gatherData */, false /* markErrors */); if (manifestParser != null) { - mActivities = manifestParser.getActivities(); - + Activity[] activities = manifestParser.getActivities(); + + mActivities.clear(); mActivityCombo.removeAll(); - - if (mActivities.length > 0) { + + for (Activity activity : activities) { + if (activity.getExported() && activity.hasAction()) { + mActivities.add(activity); + mActivityCombo.add(activity.getName()); + } + } + + if (mActivities.size() > 0) { if (mLaunchAction == LaunchConfigDelegate.ACTION_ACTIVITY) { mActivityCombo.setEnabled(true); } - for (String s : mActivities) { - mActivityCombo.add(s); - } } else { mActivityCombo.setEnabled(false); } @@ -435,7 +444,7 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab { // if we reach this point, either project is null, or we got an exception during // the parsing. In either case, we empty the activity list. mActivityCombo.removeAll(); - mActivities = null; + mActivities.clear(); } /** diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newproject/NewProjectCreationPage.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newproject/NewProjectCreationPage.java index e26b31cc3..6e8ff47fe 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newproject/NewProjectCreationPage.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newproject/NewProjectCreationPage.java @@ -27,6 +27,7 @@ import com.android.ide.eclipse.adt.sdk.Sdk; import com.android.ide.eclipse.adt.sdk.Sdk.ITargetChangeListener; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; +import com.android.ide.eclipse.common.project.AndroidManifestParser.Activity; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.SdkConstants; import com.android.sdklib.project.ProjectProperties; @@ -859,6 +860,7 @@ public class NewProjectCreationPage extends WizardPage { } String packageName = null; + Activity activity = null; String activityName = null; int minSdkVersion = AndroidManifestParser.INVALID_MIN_SDK; try { @@ -866,11 +868,11 @@ public class NewProjectCreationPage extends WizardPage { minSdkVersion = manifestData.getApiLevelRequirement(); // try to get the first launcher activity. If none, just take the first activity. - activityName = manifestData.getLauncherActivity(); - if (activityName == null) { - String[] activities = manifestData.getActivities(); + activity = manifestData.getLauncherActivity(); + if (activity == null) { + Activity[] activities = manifestData.getActivities(); if (activities != null && activities.length > 0) { - activityName = activities[0]; + activity = activities[0]; } } } catch (Exception e) { @@ -881,7 +883,10 @@ public class NewProjectCreationPage extends WizardPage { mPackageNameField.setText(packageName); } - activityName = AndroidManifestParser.extractActivityName(activityName, packageName); + if (activity != null) { + activityName = AndroidManifestParser.extractActivityName(activity.getName(), + packageName); + } if (activityName != null && activityName.length() > 0) { mInternalActivityNameUpdate = true; @@ -1136,7 +1141,7 @@ public class NewProjectCreationPage extends WizardPage { MSG_ERROR); } - String[] activities = manifestData.getActivities(); + Activity[] activities = manifestData.getActivities(); if (activities == null || activities.length == 0) { // This is acceptable now as long as no activity needs to be created if (isCreateActivity()) { diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java index f853adacb..69982fc66 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/project/AndroidManifestParser.java @@ -53,6 +53,7 @@ public class AndroidManifestParser { private final static String ATTRIBUTE_DEBUGGABLE = "debuggable"; //$NON-NLS-$ private final static String ATTRIBUTE_MIN_SDK_VERSION = "minSdkVersion"; //$NON-NLS-$ private final static String ATTRIBUTE_TARGET_PACKAGE = "targetPackage"; //$NON-NLS-1$ + private final static String ATTRIBUTE_EXPORTED = "exported"; //$NON-NLS-1$ private final static String NODE_MANIFEST = "manifest"; //$NON-NLS-1$ private final static String NODE_APPLICATION = "application"; //$NON-NLS-1$ private final static String NODE_ACTIVITY = "activity"; //$NON-NLS-1$ @@ -84,7 +85,7 @@ public class AndroidManifestParser { private final String mName; private final String mTargetPackage; - public Instrumentation(String name, String targetPackage) { + Instrumentation(String name, String targetPackage) { mName = name; mTargetPackage = targetPackage; } @@ -104,6 +105,60 @@ public class AndroidManifestParser { } } + /** + * Activity info obtained from the manifest. + */ + public static class Activity { + private final String mName; + private final boolean mExported; + private boolean mHasAction = false; + private boolean mHasMainAction = false; + private boolean mHasLauncherCategory = false; + + public Activity(String name, boolean exported) { + mName = name; + mExported = exported; + } + + public String getName() { + return mName; + } + + public boolean getExported() { + return mExported; + } + + public boolean hasAction() { + return mHasAction; + } + + public boolean isHomeActivity() { + return mHasMainAction && mHasLauncherCategory; + } + + void setHasAction(boolean hasAction) { + mHasAction = hasAction; + } + + /** If the activity doesn't yet have a filter set for the launcher, this resets both + * flags. This is to handle multiple intent-filters where one could have the valid + * action, and another one of the valid category. + */ + void resetIntentFilter() { + if (isHomeActivity() == false) { + mHasMainAction = mHasLauncherCategory = false; + } + } + + void setHasMainAction(boolean hasMainAction) { + mHasMainAction = hasMainAction; + } + + void setHasLauncherCategory(boolean hasLauncherCategory) { + mHasLauncherCategory = hasLauncherCategory; + } + } + /** * XML error & data handler used when parsing the AndroidManifest.xml file. * @@ -117,9 +172,9 @@ public class AndroidManifestParser { /** Application package */ private String mPackage; /** List of all activities */ - private final ArrayList mActivities = new ArrayList (); + private final ArrayList mActivities = new ArrayList (); /** Launcher activity */ - private String mLauncherActivity = null; + private Activity mLauncherActivity = null; /** list of process names declared by the manifest */ private Set mProcesses = null; /** debuggable attribute value. If null, the attribute is not present. */ @@ -139,9 +194,7 @@ public class AndroidManifestParser { private boolean mMarkErrors = false; private int mCurrentLevel = 0; private int mValidLevel = 0; - private boolean mFoundMainAction = false; - private boolean mFoundLauncherCategory = false; - private String mCurrentActivity = null; + private Activity mCurrentActivity = null; private Locator mLocator; /** @@ -173,8 +226,8 @@ public class AndroidManifestParser { * Returns the list of activities found in the manifest. * @return An array of fully qualified class names, or empty if no activity were found. */ - String[] getActivities() { - return mActivities.toArray(new String[mActivities.size()]); + Activity[] getActivities() { + return mActivities.toArray(new Activity[mActivities.size()]); } /** @@ -182,7 +235,7 @@ public class AndroidManifestParser { * up in the HOME screen. * @return the fully qualified name of a HOME activity or null if none were found. */ - String getLauncherActivity() { + Activity getLauncherActivity() { return mLauncherActivity; } @@ -314,27 +367,26 @@ public class AndroidManifestParser { case LEVEL_INTENT_FILTER: // only process this level if we are in an activity if (mCurrentActivity != null && NODE_INTENT.equals(localName)) { - // if we're at the intent level, lets reset some flag to - // be used when parsing the children - mFoundMainAction = false; - mFoundLauncherCategory = false; + mCurrentActivity.resetIntentFilter(); mValidLevel++; } break; case LEVEL_CATEGORY: - if (mCurrentActivity != null && mLauncherActivity == null) { + if (mCurrentActivity != null) { if (NODE_ACTION.equals(localName)) { // get the name attribute - if (ACTION_MAIN.equals( - getAttributeValue(attributes, ATTRIBUTE_NAME, - true /* hasNamespace */))) { - mFoundMainAction = true; + String action = getAttributeValue(attributes, ATTRIBUTE_NAME, + true /* hasNamespace */); + if (action != null) { + mCurrentActivity.setHasAction(true); + mCurrentActivity.setHasMainAction( + ACTION_MAIN.equals(action)); } } else if (NODE_CATEGORY.equals(localName)) { - if (CATEGORY_LAUNCHER.equals( - getAttributeValue(attributes, ATTRIBUTE_NAME, - true /* hasNamespace */))) { - mFoundLauncherCategory = true; + String category = getAttributeValue(attributes, ATTRIBUTE_NAME, + true /* hasNamespace */); + if (CATEGORY_LAUNCHER.equals(category)) { + mCurrentActivity.setHasLauncherCategory(true); } } @@ -378,8 +430,7 @@ public class AndroidManifestParser { case LEVEL_INTENT_FILTER: // if we found both a main action and a launcher category, this is our // launcher activity! - if (mCurrentActivity != null && - mFoundMainAction && mFoundLauncherCategory) { + if (mCurrentActivity != null && mCurrentActivity.isHomeActivity()) { mLauncherActivity = mCurrentActivity; } break; @@ -432,17 +483,23 @@ public class AndroidManifestParser { String activityName = getAttributeValue(attributes, ATTRIBUTE_NAME, true /* hasNamespace */); if (activityName != null) { - mCurrentActivity = combinePackageAndClassName(mPackage, activityName); + activityName = combinePackageAndClassName(mPackage, activityName); + + // get the exported flag. + String exportedStr = getAttributeValue(attributes, ATTRIBUTE_EXPORTED, true); + boolean exported = exportedStr == null || + exportedStr.toLowerCase().equals("true"); // $NON-NLS-1$ + mCurrentActivity = new Activity(activityName, exported); mActivities.add(mCurrentActivity); if (mMarkErrors) { - checkClass(mCurrentActivity, AndroidConstants.CLASS_ACTIVITY, + checkClass(activityName, AndroidConstants.CLASS_ACTIVITY, true /* testVisibility */); } } else { // no activity found! Aapt will output an error, // so we don't have to do anything - mCurrentActivity = activityName; + mCurrentActivity = null; } String processName = getAttributeValue(attributes, ATTRIBUTE_PROCESS, @@ -570,8 +627,8 @@ public class AndroidManifestParser { private static SAXParserFactory sParserFactory; private final String mJavaPackage; - private final String[] mActivities; - private final String mLauncherActivity; + private final Activity[] mActivities; + private final Activity mLauncherActivity; private final String[] mProcesses; private final Boolean mDebuggable; private final int mApiLevelRequirement; @@ -811,18 +868,18 @@ public class AndroidManifestParser { /** * Returns the list of activities found in the manifest. - * @return An array of fully qualified class names, or empty if no activity were found. + * @return An array of {@link Activity}, or empty if no activity were found. */ - public String[] getActivities() { + public Activity[] getActivities() { return mActivities; } /** * Returns the name of one activity found in the manifest, that is configured to show * up in the HOME screen. - * @return the fully qualified name of a HOME activity or null if none were found. + * @return The {@link Activity} representing a HOME activity or null if none were found. */ - public String getLauncherActivity() { + public Activity getLauncherActivity() { return mLauncherActivity; } @@ -880,8 +937,8 @@ public class AndroidManifestParser { * @param instrumentations the list of instrumentations parsed from the manifest. * @param libraries the list of libraries in use parsed from the manifest. */ - private AndroidManifestParser(String javaPackage, String[] activities, - String launcherActivity, String[] processes, Boolean debuggable, + private AndroidManifestParser(String javaPackage, Activity[] activities, + Activity launcherActivity, String[] processes, Boolean debuggable, int apiLevelRequirement, Instrumentation[] instrumentations, String[] libraries) { mJavaPackage = javaPackage; mActivities = activities; From bc659bb75639e227c717f26a022cc99983ac9e7c Mon Sep 17 00:00:00 2001 From: Raphael Moll <> Date: Fri, 3 Apr 2009 13:32:32 -0700 Subject: [PATCH 27/45] AI 144486: ADT: Call the Extract String Refactoring to create a new XML String ID when selecting a string reference. BUG=1722971 Automated import of CL 144486 --- .../extractstring/ExtractStringInputPage.java | 390 +++++++++++++++- .../ExtractStringRefactoring.java | 99 ++-- .../extractstring/XmlStringFileHelper.java} | 6 +- .../adt/ui/ReferenceChooserDialog.java | 36 +- .../wizards/newstring/NewStringBaseImpl.java | 439 ------------------ .../wizards/newstring/NewStringWizard.java | 66 --- .../newstring/NewStringWizardPage.java | 127 ----- 7 files changed, 461 insertions(+), 702 deletions(-) rename tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/{wizards/newstring/NewStringHelper.java => refactorings/extractstring/XmlStringFileHelper.java} (97%) delete mode 100644 tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringBaseImpl.java delete mode 100644 tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java delete mode 100644 tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringInputPage.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringInputPage.java index 1f50c07b6..7303b0210 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringInputPage.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringInputPage.java @@ -17,34 +17,72 @@ package com.android.ide.eclipse.adt.refactorings.extractstring; -import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl; -import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.INewStringPageCallback; -import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.ValidationStatus; +import com.android.ide.eclipse.adt.ui.ConfigurationSelector; +import com.android.ide.eclipse.common.AndroidConstants; +import com.android.ide.eclipse.editors.resources.configurations.FolderConfiguration; +import com.android.ide.eclipse.editors.resources.manager.ResourceFolderType; +import com.android.sdklib.SdkConstants; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardPage; import org.eclipse.ltk.ui.refactoring.UserInputWizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import java.util.HashMap; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * @see ExtractStringRefactoring */ -class ExtractStringInputPage extends UserInputWizardPage - implements IWizardPage, INewStringPageCallback { +class ExtractStringInputPage extends UserInputWizardPage implements IWizardPage { - private NewStringBaseImpl mImpl; + /** Last res file path used, shared across the session instances but specific to the + * current project. The default for unknown projects is {@link #DEFAULT_RES_FILE_PATH}. */ + private static HashMap -
+ *
- Examine the current file name to retrieve the XML filename, if any. + *
- Recompute the path based on the configuration selector (e.g. /res/values-fr/). + *
- Examine the path to retrieve all the files in it. Keep those in a local cache. + *
- If the XML filename from step 1 is not in the file list, it's a custom file name. + * Insert it and sort it. + *
- Re-populate the file combo with all the choices. + *
- Select the original XML file.
+ */
+ public void run() {
+ if (mInternalConfigChange) {
+ return;
+ }
+
+ // get current leafname, if any
+ String leafName = ""; //$NON-NLS-1$
+ String currPath = mResFileCombo.getText();
+ Matcher m = mPathRegex.matcher(currPath);
+ if (m.matches()) {
+ // Note: groups 1 and 2 cannot be null.
+ leafName = m.group(2);
+ currPath = m.group(1);
+ } else {
+ // There was a path but it was invalid. Ignore it.
+ currPath = ""; //$NON-NLS-1$
+ }
+
+ // recreate the res path from the current configuration
+ mConfigSelector.getConfiguration(mTempConfig);
+ StringBuffer sb = new StringBuffer(RES_FOLDER_ABS);
+ sb.append(mTempConfig.getFolderName(ResourceFolderType.VALUES));
+ sb.append('/');
+
+ String newPath = sb.toString();
+ if (newPath.equals(currPath) && newPath.equals(mLastFolderUsedInCombo)) {
+ // Path has not changed. No need to reload.
+ return;
+ }
+
+ // Get all the files at the new path
+
+ TreeSet
filePaths = mFolderCache.get(newPath); + + if (filePaths == null) { + filePaths = new TreeSet (); + + IFolder folder = mProject.getFolder(newPath); + if (folder != null && folder.exists()) { + try { + for (IResource res : folder.members()) { + String name = res.getName(); + if (res.getType() == IResource.FILE && name.endsWith(".xml")) { + filePaths.add(newPath + name); + } + } + } catch (CoreException e) { + // Ignore. + } + } + + mFolderCache.put(newPath, filePaths); + } + + currPath = newPath + leafName; + if (leafName.length() > 0 && !filePaths.contains(currPath)) { + filePaths.add(currPath); + } + + // Fill the combo + try { + mInternalFileComboChange = true; + + mResFileCombo.removeAll(); + + for (String filePath : filePaths) { + mResFileCombo.add(filePath); + } + + int index = -1; + if (leafName.length() > 0) { + index = mResFileCombo.indexOf(currPath); + if (index >= 0) { + mResFileCombo.select(index); + } + } + + if (index == -1) { + mResFileCombo.setText(currPath); + } + + mLastFolderUsedInCombo = newPath; + + } finally { + mInternalFileComboChange = false; + } + + // finally validate the whole page + validatePage(); + } + + /** + * Callback invoked when {@link ExtractStringInputPage#mResFileCombo} has been + * modified. + */ + public void modifyText(ModifyEvent e) { + if (mInternalFileComboChange) { + return; + } + + String wsFolderPath = mResFileCombo.getText(); + + // This is a custom path, we need to sanitize it. + // First it should start with "/res/". Then we need to make sure there are no + // relative paths, things like "../" or "./" or even "//". + wsFolderPath = wsFolderPath.replaceAll("/+\\.\\./+|/+\\./+|//+|\\\\+|^/+", "/"); //$NON-NLS-1$ //$NON-NLS-2$ + wsFolderPath = wsFolderPath.replaceAll("^\\.\\./+|^\\./+", ""); //$NON-NLS-1$ //$NON-NLS-2$ + wsFolderPath = wsFolderPath.replaceAll("/+\\.\\.$|/+\\.$|/+$", ""); //$NON-NLS-1$ //$NON-NLS-2$ + + // We get "res/foo" from selections relative to the project when we want a "/res/foo" path. + if (wsFolderPath.startsWith(RES_FOLDER_REL)) { + wsFolderPath = RES_FOLDER_ABS + wsFolderPath.substring(RES_FOLDER_REL.length()); + + mInternalFileComboChange = true; + mResFileCombo.setText(wsFolderPath); + mInternalFileComboChange = false; + } + + if (wsFolderPath.startsWith(RES_FOLDER_ABS)) { + wsFolderPath = wsFolderPath.substring(RES_FOLDER_ABS.length()); + + int pos = wsFolderPath.indexOf(AndroidConstants.WS_SEP_CHAR); + if (pos >= 0) { + wsFolderPath = wsFolderPath.substring(0, pos); + } + + String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP); + + if (folderSegments.length > 0) { + String folderName = folderSegments[0]; + + if (folderName != null && !folderName.equals(wsFolderPath)) { + // update config selector + mInternalConfigChange = true; + mConfigSelector.setConfiguration(folderSegments); + mInternalConfigChange = false; + } + } + } + + validatePage(); + } + } + } diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java index a17d81790..8a38e5268 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/ExtractStringRefactoring.java @@ -16,7 +16,6 @@ package com.android.ide.eclipse.adt.refactorings.extractstring; -import com.android.ide.eclipse.adt.wizards.newstring.NewStringHelper; import com.android.ide.eclipse.common.AndroidConstants; import com.android.ide.eclipse.common.project.AndroidManifestParser; @@ -98,8 +97,8 @@ import java.util.Map; * - On success, the wizard is shown, which let the user input the new ID to use. *
- The wizard sets the user input values into this refactoring instance, e.g. the new string * ID, the XML file to update, etc. The wizard does use the utility method - * {@link NewStringHelper#isResIdDuplicate(IProject, String, String)} to check whether the new - * ID is already defined in the target XML file. + * {@link XmlStringFileHelper#isResIdDuplicate(IProject, String, String)} to check whether + * the new ID is already defined in the target XML file. *
- Once Preview or Finish is selected in the wizard, the * {@link #checkFinalConditions(IProgressMonitor)} is called to double-check the user input * and compute the actual changes. @@ -122,10 +121,23 @@ import java.util.Map; */ public class ExtractStringRefactoring extends Refactoring { - private enum Mode { + public enum Mode { + /** + * the Extract String refactoring is called on an existing source file. + * Its purpose is then to get the selected string of the source and propose to + * change it by an XML id. The XML id may be a new one or an existing one. + */ EDIT_SOURCE, - MAKE_ID, - MAKE_NEW_ID + /** + * The Extract String refactoring is called without any source file. + * Its purpose is then to create a new XML string ID or select/modify an existing one. + */ + SELECT_ID, + /** + * The Extract String refactoring is called without any source file. + * Its purpose is then to create a new XML string ID. The ID must not already exist. + */ + SELECT_NEW_ID } /** The {@link Mode} of operation of the refactoring. */ @@ -133,6 +145,8 @@ public class ExtractStringRefactoring extends Refactoring { /** The file model being manipulated. * Value is null when not on {@link Mode#EDIT_SOURCE} mode. */ private final IFile mFile; + /** The project that contains {@link #mFile} and that contains the target XML file to modify. */ + private final IProject mProject; /** The start of the selection in {@link #mFile}. * Value is -1 when not on {@link Mode#EDIT_SOURCE} mode. */ private final int mSelectionStart; @@ -157,19 +171,30 @@ public class ExtractStringRefactoring extends Refactoring { /** The list of changes computed by {@link #checkFinalConditions(IProgressMonitor)} and * used by {@link #createChange(IProgressMonitor)}. */ private ArrayList
mChanges; - - private NewStringHelper mHelper = new NewStringHelper(); + + private XmlStringFileHelper mXmlHelper = new XmlStringFileHelper(); + + private static final String KEY_MODE = "mode"; //$NON-NLS-1$ + private static final String KEY_FILE = "file"; //$NON-NLS-1$ + private static final String KEY_PROJECT = "proj"; //$NON-NLS-1$ + private static final String KEY_SEL_START = "sel-start"; //$NON-NLS-1$ + private static final String KEY_SEL_END = "sel-end"; //$NON-NLS-1$ + private static final String KEY_TOK_ESC = "tok-esc"; //$NON-NLS-1$ public ExtractStringRefactoring(Map \n"); //$NON-NLS-1$ edit = new InsertEdit(0, content.toString()); - editGroup = new TextEditGroup("Create ID in new XML file", edit); + editGroup = new TextEditGroup("Create in new XML file", edit); } else { // The file exist. Attempt to parse it as a valid XML document. try { @@ -556,7 +597,7 @@ public class ExtractStringRefactoring extends Refactoring { } edit = new ReplaceEdit(offset, len, content.toString()); - editGroup = new TextEditGroup("Insert ID in XML file", edit); + editGroup = new TextEditGroup("Insert in XML file", edit); } } catch (CoreException e) { // Failed to read file. Ignore. Will return null below. @@ -702,8 +743,7 @@ public class ExtractStringRefactoring extends Refactoring { // the FQCN of the R class. String packageName = null; String error = null; - IProject proj = unit.getJavaProject().getProject(); - IResource manifestFile = proj.findMember(AndroidConstants.FN_ANDROID_MANIFEST); + IResource manifestFile = mProject.findMember(AndroidConstants.FN_ANDROID_MANIFEST); if (manifestFile == null || manifestFile.getType() != IResource.FILE) { error = "File not found"; } else { @@ -895,7 +935,7 @@ public class ExtractStringRefactoring extends Refactoring { mXmlStringId); ExtractStringDescriptor desc = new ExtractStringDescriptor( - mUnit.getJavaProject().getElementName(), //project + mProject.getName(), //project comment, //description comment, //comment createArgumentMap()); @@ -919,8 +959,7 @@ public class ExtractStringRefactoring extends Refactoring { * compilation unit. The resource may not exist. */ private IResource getTargetXmlResource(String xmlFileWsPath) { - IProject proj = mFile.getProject(); - IResource resource = proj.getFile(xmlFileWsPath); + IResource resource = mProject.getFile(xmlFileWsPath); return resource; } diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/XmlStringFileHelper.java similarity index 97% rename from tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java rename to tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/XmlStringFileHelper.java index 3b8392718..6c8bbdbd3 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringHelper.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/refactorings/extractstring/XmlStringFileHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.ide.eclipse.adt.wizards.newstring; +package com.android.ide.eclipse.adt.refactorings.extractstring; import com.android.ide.eclipse.common.project.AndroidXPathFactory; @@ -35,7 +35,7 @@ import javax.xml.xpath.XPathExpressionException; /** * */ -public class NewStringHelper { +class XmlStringFileHelper { /** A temporary cache of R.string IDs defined by a given xml file. The key is the * project path of the file, the data is a set of known string Ids for that file. */ @@ -43,7 +43,7 @@ public class NewStringHelper { /** An instance of XPath, created lazily on demand. */ private XPath mXPath; - public NewStringHelper() { + public XmlStringFileHelper() { } /** diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ReferenceChooserDialog.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ReferenceChooserDialog.java index 031b30382..966c5c81f 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ReferenceChooserDialog.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ReferenceChooserDialog.java @@ -70,6 +70,7 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { private FilteredTree mFilteredTree; private Button mNewResButton; private final IProject mProject; + private TreeViewer mTreeViewer; /** * @param project @@ -159,8 +160,8 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { mFilteredTree.setLayoutData(data); mFilteredTree.setFont(parent.getFont()); - TreeViewer treeViewer = mFilteredTree.getViewer(); - Tree tree = treeViewer.getTree(); + mTreeViewer = mFilteredTree.getViewer(); + Tree tree = mTreeViewer.getTree(); tree.addSelectionListener(new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { @@ -172,9 +173,9 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { } }); - treeViewer.setLabelProvider(new ResourceLabelProvider()); - treeViewer.setContentProvider(new ResourceContentProvider(false /* fullLevels */)); - treeViewer.setInput(mResources); + mTreeViewer.setLabelProvider(new ResourceLabelProvider()); + mTreeViewer.setContentProvider(new ResourceContentProvider(false /* fullLevels */)); + mTreeViewer.setInput(mResources); } protected void handleSelection() { @@ -242,8 +243,10 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { // We only support adding new strings right now mNewResButton.setEnabled(type == ResourceType.STRING); - String title = String.format("New %1$s", type == null ? "Resource" : type.getDisplayName()); + String title = String.format("New %1$s...", + type == null ? "Resource" : type.getDisplayName()); mNewResButton.setText(title); + mNewResButton.pack(); } /** @@ -259,14 +262,19 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { // We currently only support strings if (type == ResourceType.STRING) { - ExtractStringRefactoring ref = new ExtractStringRefactoring(true /*enforceNew*/); + ExtractStringRefactoring ref = new ExtractStringRefactoring( + mProject, true /*enforceNew*/); RefactoringWizard wizard = new ExtractStringWizard(ref, mProject); RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); try { IWorkbench w = PlatformUI.getWorkbench(); - op.run(w.getDisplay().getActiveShell(), wizard.getDefaultPageTitle()); - - // TODO Select string + if (op.run(w.getDisplay().getActiveShell(), wizard.getDefaultPageTitle()) == + IDialogConstants.OK_ID) { + mTreeViewer.refresh(); + + // select it if possible + setupInitialSelection(type, ref.getXmlStringId()); + } } catch (InterruptedException ex) { // Interrupted. Pass. } @@ -335,7 +343,9 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { if (resourceName.equals(resourceItem.getName())) { // name of the resource match, we select it, TreePath treePath = new TreePath(new Object[] { resourceType, resourceItem }); - mFilteredTree.getViewer().setSelection(new TreeSelection(treePath)); + mFilteredTree.getViewer().setSelection( + new TreeSelection(treePath), + true /*reveal*/); // and we're done. return; @@ -345,7 +355,9 @@ public class ReferenceChooserDialog extends SelectionStatusDialog { // if we get here, the resource type is valid, but the resource is missing. // we select and expand the resource type element. TreePath treePath = new TreePath(new Object[] { resourceType }); - mFilteredTree.getViewer().setSelection(new TreeSelection(treePath)); + mFilteredTree.getViewer().setSelection( + new TreeSelection(treePath), + true /*reveal*/); mFilteredTree.getViewer().setExpandedState(resourceType, true /* expanded */); } } diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringBaseImpl.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringBaseImpl.java deleted file mode 100644 index 334b13387..000000000 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringBaseImpl.java +++ /dev/null @@ -1,439 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.eclipse.org/org/documents/epl-v10.php - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.ide.eclipse.adt.wizards.newstring; - - -import com.android.ide.eclipse.adt.ui.ConfigurationSelector; -import com.android.ide.eclipse.common.AndroidConstants; -import com.android.ide.eclipse.editors.resources.configurations.FolderConfiguration; -import com.android.ide.eclipse.editors.resources.manager.ResourceFolderType; -import com.android.sdklib.SdkConstants; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -import java.util.HashMap; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class NewStringBaseImpl { - - public interface INewStringPageCallback { - /** - * Creates the top group with the field to replace which string and by what - * and by which options. - * - * @param content A composite with a 1-column grid layout - * @return The {@link Text} field for the new String ID name. - */ - public Text createStringGroup(Composite content); - - /** Implements {@link WizardPage#setErrorMessage(String)} */ - public void setErrorMessage(String newMessage); - /** Implements {@link WizardPage#setMessage(String, int)} */ - public void setMessage(String msg, int type); - /** Implements {@link WizardPage#setPageComplete(boolean)} */ - public void setPageComplete(boolean success); - - public void postValidatePage(ValidationStatus status); - } - - public class ValidationStatus { - private String mError = null; - private String mMessage = null; - public int mMessageType = WizardPage.NONE; - - public boolean success() { - return getError() != null; - } - - public void setError(String error) { - mError = error; - mMessageType = WizardPage.ERROR; - } - - public String getError() { - return mError; - } - - public void setMessage(String msg, int type) { - mMessage = msg; - mMessageType = type; - } - - public String getMessage() { - return mMessage; - } - - public int getMessageType() { - return mMessageType; - } - } - - /** Last res file path used, shared across the session instances but specific to the - * current project. The default for unknown projects is {@link #DEFAULT_RES_FILE_PATH}. */ - private static HashMap -
- *
- Examine the current file name to retrieve the XML filename, if any. - *
- Recompute the path based on the configuration selector (e.g. /res/values-fr/). - *
- Examine the path to retrieve all the files in it. Keep those in a local cache. - *
- If the XML filename from step 1 is not in the file list, it's a custom file name. - * Insert it and sort it. - *
- Re-populate the file combo with all the choices. - *
- Select the original XML file.
- */
- public void run() {
- if (mInternalConfigChange) {
- return;
- }
-
- // get current leafname, if any
- String leafName = ""; //$NON-NLS-1$
- String currPath = mResFileCombo.getText();
- Matcher m = mPathRegex.matcher(currPath);
- if (m.matches()) {
- // Note: groups 1 and 2 cannot be null.
- leafName = m.group(2);
- currPath = m.group(1);
- } else {
- // There was a path but it was invalid. Ignore it.
- currPath = ""; //$NON-NLS-1$
- }
-
- // recreate the res path from the current configuration
- mConfigSelector.getConfiguration(mTempConfig);
- StringBuffer sb = new StringBuffer(RES_FOLDER_ABS);
- sb.append(mTempConfig.getFolderName(ResourceFolderType.VALUES));
- sb.append('/');
-
- String newPath = sb.toString();
- if (newPath.equals(currPath) && newPath.equals(mLastFolderUsedInCombo)) {
- // Path has not changed. No need to reload.
- return;
- }
-
- // Get all the files at the new path
-
- TreeSet
filePaths = mFolderCache.get(newPath); - - if (filePaths == null) { - filePaths = new TreeSet (); - - IFolder folder = mProject.getFolder(newPath); - if (folder != null && folder.exists()) { - try { - for (IResource res : folder.members()) { - String name = res.getName(); - if (res.getType() == IResource.FILE && name.endsWith(".xml")) { //$NON-NLS-1$ - filePaths.add(newPath + name); - } - } - } catch (CoreException e) { - // Ignore. - } - } - - mFolderCache.put(newPath, filePaths); - } - - currPath = newPath + leafName; - if (leafName.length() > 0 && !filePaths.contains(currPath)) { - filePaths.add(currPath); - } - - // Fill the combo - try { - mInternalFileComboChange = true; - - mResFileCombo.removeAll(); - - for (String filePath : filePaths) { - mResFileCombo.add(filePath); - } - - int index = -1; - if (leafName.length() > 0) { - index = mResFileCombo.indexOf(currPath); - if (index >= 0) { - mResFileCombo.select(index); - } - } - - if (index == -1) { - mResFileCombo.setText(currPath); - } - - mLastFolderUsedInCombo = newPath; - - } finally { - mInternalFileComboChange = false; - } - - // finally validate the whole page - validatePage(); - } - - /** - * Callback invoked when {@link NewStringBaseImpl#mResFileCombo} has been - * modified. - */ - public void modifyText(ModifyEvent e) { - if (mInternalFileComboChange) { - return; - } - - String wsFolderPath = mResFileCombo.getText(); - - // This is a custom path, we need to sanitize it. - // First it should start with "/res/". Then we need to make sure there are no - // relative paths, things like "../" or "./" or even "//". - wsFolderPath = wsFolderPath.replaceAll("/+\\.\\./+|/+\\./+|//+|\\\\+|^/+", "/"); //$NON-NLS-1$ //$NON-NLS-2$ - wsFolderPath = wsFolderPath.replaceAll("^\\.\\./+|^\\./+", ""); //$NON-NLS-1$ //$NON-NLS-2$ - wsFolderPath = wsFolderPath.replaceAll("/+\\.\\.$|/+\\.$|/+$", ""); //$NON-NLS-1$ //$NON-NLS-2$ - - // We get "res/foo" from selections relative to the project when we want a "/res/foo" path. - if (wsFolderPath.startsWith(RES_FOLDER_REL)) { - wsFolderPath = RES_FOLDER_ABS + wsFolderPath.substring(RES_FOLDER_REL.length()); - - mInternalFileComboChange = true; - mResFileCombo.setText(wsFolderPath); - mInternalFileComboChange = false; - } - - if (wsFolderPath.startsWith(RES_FOLDER_ABS)) { - wsFolderPath = wsFolderPath.substring(RES_FOLDER_ABS.length()); - - int pos = wsFolderPath.indexOf(AndroidConstants.WS_SEP_CHAR); - if (pos >= 0) { - wsFolderPath = wsFolderPath.substring(0, pos); - } - - String[] folderSegments = wsFolderPath.split(FolderConfiguration.QUALIFIER_SEP); - - if (folderSegments.length > 0) { - String folderName = folderSegments[0]; - - if (folderName != null && !folderName.equals(wsFolderPath)) { - // update config selector - mInternalConfigChange = true; - mConfigSelector.setConfiguration(folderSegments); - mInternalConfigChange = false; - } - } - } - - validatePage(); - } - } -} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java deleted file mode 100644 index f7d8fe863..000000000 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizard.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.eclipse.org/org/documents/epl-v10.php - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.ide.eclipse.adt.wizards.newstring; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.wizard.Wizard; - -/** - * - */ -public class NewStringWizard extends Wizard { - - protected static final String MAIN_PAGE_NAME = "newXmlStringPage"; //$NON-NLS-1$ - - private NewStringWizardPage mMainPage; - - public NewStringWizard(IProject project) { - super(); - - mMainPage = createMainPage(project); - } - - /** - * Creates the wizard page. - * - * Please do NOT override this method. - * - * This is protected so that it can be overridden by unit tests. - * However the contract of this class is private and NO ATTEMPT will be made - * to maintain compatibility between different versions of the plugin. - * @param project - */ - protected NewStringWizardPage createMainPage(IProject project) { - return new NewStringWizardPage(project, MAIN_PAGE_NAME); - } - - @Override - public void addPages() { - addPage(mMainPage); - super.addPages(); - } - - /** - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - // pass - return false; - } - -} diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java deleted file mode 100644 index 1e2d27277..000000000 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/wizards/newstring/NewStringWizardPage.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Eclipse Public License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.eclipse.org/org/documents/epl-v10.php - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.ide.eclipse.adt.wizards.newstring; - -import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.INewStringPageCallback; -import com.android.ide.eclipse.adt.wizards.newstring.NewStringBaseImpl.ValidationStatus; - -import org.eclipse.core.resources.IProject; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -/** - * - */ -class NewStringWizardPage extends WizardPage implements INewStringPageCallback { - - private NewStringBaseImpl mImpl; - - /** Field displaying the user-selected string to be replaced. */ - private Label mStringValueField; - - private String mNewStringId; - - public NewStringWizardPage(IProject project, String pageName) { - super(pageName); - mImpl = new NewStringBaseImpl(project, this); - } - - public String getNewStringValue() { - return mStringValueField.getText(); - } - - public String getNewStringId() { - return mNewStringId; - } - - public String getResFilePathProjPath() { - return mImpl.getResFileProjPath(); - } - - /** - * Create the UI for the new string wizard. - */ - public void createControl(Composite parent) { - Composite content = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - content.setLayout(layout); - - mImpl.createControl(content); - setControl(content); - } - - /** - * Creates the top group with the field to replace which string and by what - * and by which options. - * - * @param content A composite with a 1-column grid layout - * @return The {@link Text} field for the new String ID name. - */ - public Text createStringGroup(Composite content) { - - Group group = new Group(content, SWT.NONE); - group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - group.setText("New String"); - - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - group.setLayout(layout); - - Label label = new Label(group, SWT.NONE); - label.setText("String:"); - - mStringValueField = new Label(group, SWT.NONE); - mStringValueField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - mStringValueField.setText(""); //$NON-NLS-1$ - - // TODO provide an option to refactor all known occurences of this string. - - // line : Textfield for new ID - - label = new Label(group, SWT.NONE); - label.setText("Replace by R.string."); - - final Text stringIdField = new Text(group, SWT.SINGLE | SWT.LEFT | SWT.BORDER); - stringIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - stringIdField.setText(""); - - mNewStringId = stringIdField.getText().trim(); - - stringIdField.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - if (mImpl.validatePage()) { - mNewStringId = stringIdField.getText().trim(); - } - } - }); - - return stringIdField; - } - - public void postValidatePage(ValidationStatus status) { - // pass - } -} From d7c946dcef7e69a96ee00bc0f34b8bbb7db1a68c Mon Sep 17 00:00:00 2001 From: Raphael Moll <> Date: Fri, 3 Apr 2009 13:33:43 -0700 Subject: [PATCH 28/45] AI 144487: ADT: Add "New String" refactoring to the other Resource Chooser. BUG=1722971 Automated import of CL 144487 --- .../ide/eclipse/adt/ui/ResourceChooser.java | 203 +++++++++++++----- .../uimodel/UiResourceAttributeNode.java | 7 +- 2 files changed, 154 insertions(+), 56 deletions(-) diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java index 26396116c..d7eeb0455 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/ui/ResourceChooser.java @@ -16,10 +16,16 @@ package com.android.ide.eclipse.adt.ui; +import com.android.ide.eclipse.adt.refactorings.extractstring.ExtractStringRefactoring; +import com.android.ide.eclipse.adt.refactorings.extractstring.ExtractStringWizard; import com.android.ide.eclipse.common.resources.IResourceRepository; import com.android.ide.eclipse.common.resources.ResourceItem; import com.android.ide.eclipse.common.resources.ResourceType; +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -27,6 +33,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.AbstractElementListSelectionDialog; import java.util.regex.Matcher; @@ -50,26 +58,32 @@ public class ResourceChooser extends AbstractElementListSelectionDialog { private Button mSystemButton; private String mCurrentResource; + + private final IProject mProject; /** * Creates a Resource Chooser dialog. + * @param project Project being worked on * @param type The type of the resource to choose - * @param project The repository for the project - * @param system The System resource repository + * @param projectResources The repository for the project + * @param systemResources The System resource repository * @param parent the parent shell */ - public ResourceChooser(ResourceType type, IResourceRepository project, - IResourceRepository system, Shell parent) { + public ResourceChooser(IProject project, ResourceType type, + IResourceRepository projectResources, + IResourceRepository systemResources, + Shell parent) { super(parent, new ResourceLabelProvider()); + mProject = project; mResourceType = type; - mProjectResources = project; + mProjectResources = projectResources; mProjectResourcePattern = Pattern.compile( "@" + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ //$NON-NLS-2$ if (SHOW_SYSTEM_RESOURCE) { - mSystemResources = system; + mSystemResources = systemResources; mSystemResourcePattern = Pattern.compile( "@android:" + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -108,7 +122,11 @@ public class ResourceChooser extends AbstractElementListSelectionDialog { createFilterText(top); createFilteredList(top); - setupResourceListAndCurrent(); + // create the "New Resource" button + createNewResButtons(top); + + setupResourceList(); + selectResourceString(mCurrentResource); return top; } @@ -127,7 +145,9 @@ public class ResourceChooser extends AbstractElementListSelectionDialog { @Override public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); - setListElements(mProjectResources.getResources(mResourceType)); + if (mProjectButton.getSelection()) { + setListElements(mProjectResources.getResources(mResourceType)); + } } }); mSystemButton = new Button(top, SWT.RADIO); @@ -136,63 +156,138 @@ public class ResourceChooser extends AbstractElementListSelectionDialog { @Override public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); - setListElements(mSystemResources.getResources(mResourceType)); + if (mProjectButton.getSelection()) { + setListElements(mSystemResources.getResources(mResourceType)); + } + } + }); + } + + /** + * Creates the "New Resource" button. + * @param top the parent composite + */ + private void createNewResButtons(Composite top) { + + Button newResButton = new Button(top, SWT.NONE); + + String title = String.format("New %1$s...", mResourceType.getDisplayName()); + newResButton.setText(title); + + // We only support adding new strings right now + newResButton.setEnabled(mResourceType == ResourceType.STRING); + + newResButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + super.widgetSelected(e); + + if (mResourceType == ResourceType.STRING) { + createNewString(); + } } }); } - /** - * Setups the current list based on the current resource. - */ - private void setupResourceListAndCurrent() { - if (setupInitialSelection(mProjectResourcePattern, mProjectResources) == false) { - // if we couldn't understand the current value, we default to the project resources - ResourceItem[] items = mProjectResources.getResources(mResourceType); - setListElements(items); - } + private void createNewString() { + ExtractStringRefactoring ref = new ExtractStringRefactoring( + mProject, true /*enforceNew*/); + RefactoringWizard wizard = new ExtractStringWizard(ref, mProject); + RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); + try { + IWorkbench w = PlatformUI.getWorkbench(); + if (op.run(w.getDisplay().getActiveShell(), wizard.getDefaultPageTitle()) == + IDialogConstants.OK_ID) { - if (SHOW_SYSTEM_RESOURCE) { - if (setupInitialSelection(mProjectResourcePattern, mProjectResources) == false) { - if (setupInitialSelection(mSystemResourcePattern, mSystemResources) == false) { - // if we couldn't understand the current value, - // we default to the project resources - ResourceItem[] items = mProjectResources.getResources(mResourceType); - setListElements(items); - mProjectButton.setSelection(true); - } else { - mSystemButton.setSelection(true); - } - } else { - mProjectButton.setSelection(true); + // Recompute the "current resource" to select the new id + setupResourceList(); + + // select it if possible + selectItemName(ref.getXmlStringId()); } + } catch (InterruptedException ex) { + // Interrupted. Pass. } } + + /** + * @return The repository currently selected. + */ + private IResourceRepository getCurrentRepository() { + IResourceRepository repo = mProjectResources; + + if (SHOW_SYSTEM_RESOURCE && mSystemButton.getSelection()) { + repo = mSystemResources; + } + return repo; + } + + /** + * Setups the current list. + */ + private void setupResourceList() { + IResourceRepository repo = getCurrentRepository(); + setListElements(repo.getResources(mResourceType)); + } /** - * Attempts to setup the list of element from a repository if the current resource - * matches the provided pattern. - * @param pattern the pattern to test the current value - * @param repository the repository to use if the pattern matches. - * @return true if success. + * Select an item by its name, if possible. */ - private boolean setupInitialSelection(Pattern pattern, IResourceRepository repository) { - Matcher m = pattern.matcher(mCurrentResource); - if (m.matches()) { - // we have a project resource, let's setup the list - ResourceItem[] items = repository.getResources(mResourceType); - setListElements(items); - - // and let's look for the item we found - String name = m.group(1); - - for (ResourceItem item : items) { - if (name.equals(item.getName())) { - setSelection(new Object[] { item }); - break; - } - } - return true; + private void selectItemName(String itemName) { + if (itemName == null) { + return; + } + + IResourceRepository repo = getCurrentRepository(); + + ResourceItem[] items = repo.getResources(mResourceType); + + for (ResourceItem item : items) { + if (itemName.equals(item.getName())) { + setSelection(new Object[] { item }); + break; + } + } + } + + /** + * Select an item by its full resource string. + * This also selects between project and system repository based on the resource string. + */ + private void selectResourceString(String resourceString) { + boolean isSystem = false; + String itemName = null; + + // Is this a system resource? + // If not a system resource or if they are not available, this will be a project res. + if (SHOW_SYSTEM_RESOURCE) { + Matcher m = mSystemResourcePattern.matcher(resourceString); + if (m.matches()) { + itemName = m.group(1); + isSystem = true; + } + } + + if (!isSystem && itemName == null) { + // Try to match project resource name + Matcher m = mProjectResourcePattern.matcher(resourceString); + if (m.matches()) { + itemName = m.group(1); + } + } + + // Update the repository selection + if (SHOW_SYSTEM_RESOURCE) { + mProjectButton.setSelection(!isSystem); + mSystemButton.setSelection(isSystem); + } + + // Update the list + setupResourceList(); + + // If we have a selection name, select it + if (itemName != null) { + selectItemName(itemName); } - return false; } } diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java index 56bb8f492..284cff4ca 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/editors/uimodel/UiResourceAttributeNode.java @@ -135,8 +135,11 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { IResourceRepository systemRepository = data.getSystemResources(); // open a resource chooser dialog for specified resource type. - ResourceChooser dlg = new ResourceChooser(mType, - projectRepository, systemRepository, shell); + ResourceChooser dlg = new ResourceChooser(project, + mType, + projectRepository, + systemRepository, + shell); dlg.setCurrentResource(currentValue); From e7837ffa1f8466a79d76fa70bb804a264abea915 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi <> Date: Fri, 3 Apr 2009 15:01:10 -0700 Subject: [PATCH 29/45] AI 144509: Checking in Sonivox' JetBoy code sample. The java code still has a FIXME for cleanup and review to be done before final SDK build. BUG=1596727 Automated import of CL 144509 --- samples/JetBoy/Android.mk | 10 + samples/JetBoy/AndroidManifest.xml | 37 + samples/JetBoy/res/drawable/asteroid01.png | Bin 0 -> 6707 bytes samples/JetBoy/res/drawable/asteroid02.png | Bin 0 -> 6633 bytes samples/JetBoy/res/drawable/asteroid03.png | Bin 0 -> 6771 bytes samples/JetBoy/res/drawable/asteroid04.png | Bin 0 -> 6803 bytes samples/JetBoy/res/drawable/asteroid05.png | Bin 0 -> 6636 bytes samples/JetBoy/res/drawable/asteroid06.png | Bin 0 -> 6802 bytes samples/JetBoy/res/drawable/asteroid07.png | Bin 0 -> 6794 bytes samples/JetBoy/res/drawable/asteroid08.png | Bin 0 -> 6668 bytes samples/JetBoy/res/drawable/asteroid09.png | Bin 0 -> 6912 bytes samples/JetBoy/res/drawable/asteroid10.png | Bin 0 -> 6703 bytes samples/JetBoy/res/drawable/asteroid11.png | Bin 0 -> 6687 bytes samples/JetBoy/res/drawable/asteroid12.png | Bin 0 -> 6816 bytes .../JetBoy/res/drawable/asteroid_explode1.png | Bin 0 -> 11018 bytes .../JetBoy/res/drawable/asteroid_explode2.png | Bin 0 -> 13425 bytes .../JetBoy/res/drawable/asteroid_explode3.png | Bin 0 -> 14171 bytes .../JetBoy/res/drawable/asteroid_explode4.png | Bin 0 -> 10616 bytes samples/JetBoy/res/drawable/background_a.png | Bin 0 -> 200826 bytes samples/JetBoy/res/drawable/background_b.png | Bin 0 -> 60165 bytes samples/JetBoy/res/drawable/icon.png | Bin 0 -> 6283 bytes samples/JetBoy/res/drawable/int_timer.png | Bin 0 -> 9409 bytes samples/JetBoy/res/drawable/intbeam_1.png | Bin 0 -> 19649 bytes samples/JetBoy/res/drawable/intbeam_2.png | Bin 0 -> 19506 bytes samples/JetBoy/res/drawable/intbeam_3.png | Bin 0 -> 19104 bytes samples/JetBoy/res/drawable/intbeam_4.png | Bin 0 -> 19506 bytes samples/JetBoy/res/drawable/laser.png | Bin 0 -> 3355 bytes samples/JetBoy/res/drawable/ship2_1.png | Bin 0 -> 11308 bytes samples/JetBoy/res/drawable/ship2_2.png | Bin 0 -> 11568 bytes samples/JetBoy/res/drawable/ship2_3.png | Bin 0 -> 11368 bytes samples/JetBoy/res/drawable/ship2_4.png | Bin 0 -> 11481 bytes samples/JetBoy/res/drawable/ship2_hit_1.png | Bin 0 -> 12569 bytes samples/JetBoy/res/drawable/ship2_hit_2.png | Bin 0 -> 13314 bytes samples/JetBoy/res/drawable/ship2_hit_3.png | Bin 0 -> 12365 bytes samples/JetBoy/res/drawable/ship2_hit_4.png | Bin 0 -> 12820 bytes samples/JetBoy/res/drawable/title_bg_hori.png | Bin 0 -> 153019 bytes samples/JetBoy/res/drawable/title_hori.png | Bin 0 -> 169865 bytes samples/JetBoy/res/layout/main.xml | 93 + samples/JetBoy/res/raw/level1.jet | Bin 0 -> 776300 bytes samples/JetBoy/res/values/strings.xml | 13 + samples/JetBoy/res/values/styles.xml | 40 + .../com/example/android/jetboy/Asteroid.java | 31 + .../com/example/android/jetboy/Explosion.java | 26 + .../com/example/android/jetboy/JetBoy.java | 161 ++ .../example/android/jetboy/JetBoyView.java | 1753 +++++++++++++++++ 45 files changed, 2164 insertions(+) create mode 100755 samples/JetBoy/Android.mk create mode 100755 samples/JetBoy/AndroidManifest.xml create mode 100755 samples/JetBoy/res/drawable/asteroid01.png create mode 100755 samples/JetBoy/res/drawable/asteroid02.png create mode 100755 samples/JetBoy/res/drawable/asteroid03.png create mode 100755 samples/JetBoy/res/drawable/asteroid04.png create mode 100755 samples/JetBoy/res/drawable/asteroid05.png create mode 100755 samples/JetBoy/res/drawable/asteroid06.png create mode 100755 samples/JetBoy/res/drawable/asteroid07.png create mode 100755 samples/JetBoy/res/drawable/asteroid08.png create mode 100755 samples/JetBoy/res/drawable/asteroid09.png create mode 100755 samples/JetBoy/res/drawable/asteroid10.png create mode 100755 samples/JetBoy/res/drawable/asteroid11.png create mode 100755 samples/JetBoy/res/drawable/asteroid12.png create mode 100755 samples/JetBoy/res/drawable/asteroid_explode1.png create mode 100755 samples/JetBoy/res/drawable/asteroid_explode2.png create mode 100755 samples/JetBoy/res/drawable/asteroid_explode3.png create mode 100755 samples/JetBoy/res/drawable/asteroid_explode4.png create mode 100755 samples/JetBoy/res/drawable/background_a.png create mode 100755 samples/JetBoy/res/drawable/background_b.png create mode 100755 samples/JetBoy/res/drawable/icon.png create mode 100755 samples/JetBoy/res/drawable/int_timer.png create mode 100755 samples/JetBoy/res/drawable/intbeam_1.png create mode 100755 samples/JetBoy/res/drawable/intbeam_2.png create mode 100755 samples/JetBoy/res/drawable/intbeam_3.png create mode 100755 samples/JetBoy/res/drawable/intbeam_4.png create mode 100755 samples/JetBoy/res/drawable/laser.png create mode 100755 samples/JetBoy/res/drawable/ship2_1.png create mode 100755 samples/JetBoy/res/drawable/ship2_2.png create mode 100755 samples/JetBoy/res/drawable/ship2_3.png create mode 100755 samples/JetBoy/res/drawable/ship2_4.png create mode 100755 samples/JetBoy/res/drawable/ship2_hit_1.png create mode 100755 samples/JetBoy/res/drawable/ship2_hit_2.png create mode 100755 samples/JetBoy/res/drawable/ship2_hit_3.png create mode 100755 samples/JetBoy/res/drawable/ship2_hit_4.png create mode 100755 samples/JetBoy/res/drawable/title_bg_hori.png create mode 100755 samples/JetBoy/res/drawable/title_hori.png create mode 100755 samples/JetBoy/res/layout/main.xml create mode 100755 samples/JetBoy/res/raw/level1.jet create mode 100755 samples/JetBoy/res/values/strings.xml create mode 100755 samples/JetBoy/res/values/styles.xml create mode 100755 samples/JetBoy/src/com/example/android/jetboy/Asteroid.java create mode 100755 samples/JetBoy/src/com/example/android/jetboy/Explosion.java create mode 100755 samples/JetBoy/src/com/example/android/jetboy/JetBoy.java create mode 100755 samples/JetBoy/src/com/example/android/jetboy/JetBoyView.java diff --git a/samples/JetBoy/Android.mk b/samples/JetBoy/Android.mk new file mode 100755 index 000000000..2e6b57133 --- /dev/null +++ b/samples/JetBoy/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := samples + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := JETBoy + +include $(BUILD_PACKAGE) diff --git a/samples/JetBoy/AndroidManifest.xml b/samples/JetBoy/AndroidManifest.xml new file mode 100755 index 000000000..d90e6f5c5 --- /dev/null +++ b/samples/JetBoy/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + \ No newline at end of file diff --git a/samples/JetBoy/res/drawable/asteroid01.png b/samples/JetBoy/res/drawable/asteroid01.png new file mode 100755 index 0000000000000000000000000000000000000000..1cede4f0b9b13cffa6f484b6edd1fae79576d98b GIT binary patch literal 6707 zcmV-38qDR1P)+ ++ ++ ++ + Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh 5Dj_4M*U5?QK=A&o3zBZ9GP z*B-a;UgV#S ciLs>`>F741>L3~d#tOj)`W=Uo5I2S~Nf~1xNiD_{ zE>akVl9UWK7D7;buJ|k?ES%wYZrnn1s4U)v&r-zAH3QHV;h+1?^5CJIvkN_19mmP3 z78A!#bLdA;@$`Q`Mu=*ZH|<2MC3IWlt$Ff(!1V*Z@A1wvIoD(V$&8jABdQL71c(xX zD ^L3wq2E{A%IvER#Jv@RnLMgSB>M1UiIW@Dw;_NJEr L)!;D!xc!Zp;?aU<(?>tc*8YsVrX=jY-xdX zYzGo0cvqx B~G#ohVDW^h`8X_y4o$umQ**H{T z$0bdo*nq-PtH;#Y1-iXHL(K}~o0_Dhn3D$&bM%E1MD-Dp!7-9r6R|=kcbuG9;Ml1- z7M3~~0$$ Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh O~MRt_GkULI_~M7$J@=)*6EUfksh<%+&y#wcI{$#aal;y+)opACQ22P|e>S>CV(`c2W2y$)W0%8Rh8&se*5wmMHB@#sh!k9w< zi~%2Dz7d#6K$RnaeJ%hPkU#WZADnM=dD*TU=PdJ6DXFVh7Fod>gZE%ujGNhyZB8Mo z2oNg8mjM~Sc?3l2&wKW?nP^5>ltwJH5o8g6%6umyG77>G@RE2`Es0S@eqK3mnmf)3qP?0*v!TnQodj*@_ z5usNy*>)`Mn_$<0y-ZHzpz6k%=e7bczzL9F@_}EaswVbK_Ic||VAd$Tk>$`_lQ=Sr zDy68DqV!D6%y8h&nsGCCL)*I<~;k0~tt(dO cfl{*<+*bXMuoD`_kf|1I1(p#Rf @syG0;MEn);k30^S>kx{;OI_LL3TX1G2U=ltr@D^bG zW_O4GNsy Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh A&St^Gxh8ipxf7fS+GvbXs4cal1S<79^=5@gMi~kNBJHu>p_L*G1B!*?h$~9t z(h40YlmS6QoM63TR95-muk4lCr49AvZyvwJ#O71L_qGkd+}cwts-?905MuSsm-d+% z4Cq>@!~w1020bfy>#<%D#{nv{B%z|4m%i;iR3nA;f)&O1a0As@!1@do1k@TK;sca| zJhj-uVnR(A8vwFR2Y4z24T9D*Yn_a>lO1-sK)vNPQ+)NVGht!vO ;TvSumfNRzzcQ#&j7#{ V$J^q4pTPhC002ovPDHLkV1i`jyJi3Y literal 0 HcmV?d00001 diff --git a/samples/JetBoy/res/drawable/asteroid04.png b/samples/JetBoy/res/drawable/asteroid04.png new file mode 100755 index 0000000000000000000000000000000000000000..e89e6f13f0bd7aa64040a755656cb7bbaadf8558 GIT binary patch literal 6803 zcmV;E8f@i>P) Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh c=a1=O4F%N?j^4WnNi}Y6VL~9=}FR6-@ww z&=5BpNEp#uc$7C@H^tW3Ccf}50A98c7BGrxYEeQ_`dPJ70wlG7@m8HAvK+bR5KF5a zf?9%>CB{^f5L4ZdbpiG3lCW+KkFU0ZE7w=wRgcCR;xr(xTcUbEShJu?&>SObj?iCQ zX3vD<4KLpg&RgL18v$Sfd|-_d#fB&pLL+!poL9!15ySO}tl#JC!YW~Fil8-(hINA2 z64eZz2=6Vv^i{2}9<+R^>#r5?sCxXm>nJ?#4wcz^ia|-%&2Ub@XGF~*N`)J)8Dqze z5nSPa8)#i<07Iyf#)evCNRxniC`3|4NEM-xhD2eA7=zFHcyB4ofMVTRY7;X=t%)jY z)oR6k>G0lR!jN?P9vZv$Az_LDHmY&}1YGIK`wju3dO|wA6 Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh