AI 143270: am: CL 143149 Make ADT look for javadoc in docs/reference for the optional...

  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 143270

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java
index 226357f..d0d8ae3 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/common/AndroidConstants.java
@@ -90,7 +90,7 @@ public class AndroidConstants {
 
     /** Name of the android sources directory */
     public static final String FD_ANDROID_SOURCES = "sources"; //$NON-NLS-1$
-
+    
     /** Resource java class  filename, i.e. "R.java" */
     public final static String FN_RESOURCE_CLASS = "R.java"; //$NON-NLS-1$
     /** Resource class file  filename, i.e. "R.class" */
@@ -128,7 +128,8 @@ public class AndroidConstants {
     public final static String WS_ASSETS = WS_SEP + SdkConstants.FD_ASSETS;
 
     /** Leaf of the javaDoc folder. Does not start with a separator. */
-    public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/reference"; //$NON-NLS-1$
+    public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/" +
+            SdkConstants.FD_DOCS_REFERENCE; //$NON-NLS-1$
 
     /** Path of the samples directory relative to the sdk folder.
      *  This is an OS path, ending with a separator.

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java
index 0a59107..d1ae343 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/AddOnTarget.java
@@ -153,7 +153,8 @@ final class AddOnTarget implements IAndroidTarget {
             case SKINS:
                 return mLocation + SdkConstants.OS_SKINS_FOLDER;
             case DOCS:
-                return mLocation + SdkConstants.FD_DOCS + File.separator;
+                return mLocation + SdkConstants.FD_DOCS + File.separator
+                        + SdkConstants.FD_DOCS_REFERENCE;
             default :
                 return mBasePlatform.getPath(pathId);
         }

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
index 00594d1..9eb6ade 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
@@ -143,6 +143,8 @@ public final class SdkConstants {
     public final static String FD_LIB = "lib";
     /** Name of the SDK docs folder. */
     public final static String FD_DOCS = "docs";
+    /** Name of the doc folder containing API reference doc (javadoc) */
+    public static final String FD_DOCS_REFERENCE = "reference";
     /** Name of the SDK images folder. */
     public final static String FD_IMAGES = "images";
     /** Name of the SDK skins folder. */

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java
index 67c70a6..d62c231 100644 (file)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java
@@ -89,9 +89,9 @@ public final class AvdSelector {
         final TableColumn column1 = new TableColumn(mTable, SWT.NONE);
         column1.setText("Target Name");
         final TableColumn column2 = new TableColumn(mTable, SWT.NONE);
-        column2.setText("API Level");
+        column2.setText("SDK");
         final TableColumn column3 = new TableColumn(mTable, SWT.NONE);
-        column3.setText("SDK");
+        column3.setText("API Level");
 
         adjustColumnsWidth(mTable, column0, column1, column2, column3);
         setupSelectionListener(mTable);
@@ -235,8 +235,8 @@ public final class AvdSelector {
                 Rectangle r = table.getClientArea();
                 column0.setWidth(r.width * 30 / 100); // 30%  
                 column1.setWidth(r.width * 45 / 100); // 45%
-                column2.setWidth(r.width * 15 / 100); // 15%
-                column3.setWidth(r.width * 10 / 100); // 10%
+                column2.setWidth(r.width * 10 / 100); // 10%
+                column3.setWidth(r.width * 15 / 100); // 15%
             }
         });
     }