منصة شليله
Fork

Commit

Revisão	fe8bec70caf01fa91ae3dd05bc441ba7d7b66929 (tree)
Hora	2009-03-28 07:05:58
Autor	Xavier Ducrohet <>
Commiter	The Android Open Source Project

AI 143149: Make ADT look for javadoc in docs/reference for the optional libraries (to match the base docs).

BUG=1743022

Automated import of CL 143149

--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java

+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java

		@@ -90,7 +90,7 @@ public class AndroidConstants {
90	90
91	91	/** Name of the android sources directory */
92	92	public static final String FD_ANDROID_SOURCES = "sources"; //$NON-NLS-1$
93		-
	93	+
94	94	/** Resource java class filename, i.e. "R.java" */
95	95	public final static String FN_RESOURCE_CLASS = "R.java"; //$NON-NLS-1$
96	96	/** Resource class file filename, i.e. "R.class" */

		@@ -128,7 +128,8 @@ public class AndroidConstants {
128	128	public final static String WS_ASSETS = WS_SEP + SdkConstants.FD_ASSETS;
129	129
130	130	/** Leaf of the javaDoc folder. Does not start with a separator. */
131		- public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/reference"; //$NON-NLS-1$
	131	+ public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/" +
	132	+ SdkConstants.FD_DOCS_REFERENCE; //$NON-NLS-1$
132	133
133	134	/** Path of the samples directory relative to the sdk folder.
134	135	* This is an OS path, ending with a separator.

--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java

+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java

		@@ -153,7 +153,8 @@ final class AddOnTarget implements IAndroidTarget {
153	153	case SKINS:
154	154	return mLocation + SdkConstants.OS_SKINS_FOLDER;
155	155	case DOCS:
156		- return mLocation + SdkConstants.FD_DOCS + File.separator;
	156	+ return mLocation + SdkConstants.FD_DOCS + File.separator
	157	+ + SdkConstants.FD_DOCS_REFERENCE;
157	158	default :
158	159	return mBasePlatform.getPath(pathId);
159	160	}

--- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java

+++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java

		@@ -143,6 +143,8 @@ public final class SdkConstants {
143	143	public final static String FD_LIB = "lib";
144	144	/** Name of the SDK docs folder. */
145	145	public final static String FD_DOCS = "docs";
	146	+ /** Name of the doc folder containing API reference doc (javadoc) */
	147	+ public static final String FD_DOCS_REFERENCE = "reference";
146	148	/** Name of the SDK images folder. */
147	149	public final static String FD_IMAGES = "images";
148	150	/** Name of the SDK skins folder. */

--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java

+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java

		@@ -89,9 +89,9 @@ public final class AvdSelector {
89	89	final TableColumn column1 = new TableColumn(mTable, SWT.NONE);
90	90	column1.setText("Target Name");
91	91	final TableColumn column2 = new TableColumn(mTable, SWT.NONE);
92		- column2.setText("API Level");
	92	+ column2.setText("SDK");
93	93	final TableColumn column3 = new TableColumn(mTable, SWT.NONE);
94		- column3.setText("SDK");
	94	+ column3.setText("API Level");
95	95
96	96	adjustColumnsWidth(mTable, column0, column1, column2, column3);
97	97	setupSelectionListener(mTable);

		@@ -235,8 +235,8 @@ public final class AvdSelector {
235	235	Rectangle r = table.getClientArea();
236	236	column0.setWidth(r.width * 30 / 100); // 30%
237	237	column1.setWidth(r.width * 45 / 100); // 45%
238		- column2.setWidth(r.width * 15 / 100); // 15%
239		- column3.setWidth(r.width * 10 / 100); // 10%
	238	+ column2.setWidth(r.width * 10 / 100); // 10%
	239	+ column3.setWidth(r.width * 15 / 100); // 15%
240	240	}
241	241	});
242	242	}