diff --git a/pdk/README b/pdk/README index 229db43b9..2bdba93f4 100644 --- a/pdk/README +++ b/pdk/README @@ -57,8 +57,8 @@ You must install google appengine. See: http://code.google.com/appengine/downlo Here's the command to run the pdk-docs server locally: python /dev_appserver.py --address 0.0.0.0 \ /android/out/target/common/docs - -To verify it is working you can access it with a browser locally on port 8080: + +To verify it is working, you can access it with a browser locally on port 8080: http://localhost:8080/online-pdk/guide/index.html diff --git a/pdk/docs/guide/build_new_device.jd b/pdk/docs/guide/build_new_device.jd index 895ed3dbc..dabdfb061 100755 --- a/pdk/docs/guide/build_new_device.jd +++ b/pdk/docs/guide/build_new_device.jd @@ -1,4 +1,4 @@ -page.title=Building Android for a new Device +page.title=Configuring a New Product pdk.version=1.0 @jd:body @@ -34,10 +34,12 @@ pdk.version=1.0 # Overrides PRODUCT_NAME := <first_product_name> PRODUCT_DEVICE := <board_name> - Additional product-specific variables can be added to this Product Definition file. - +
  • + Additional product-specific variables can be added to this Product Definition +file. +
  • In the products directory, create an AndroidProducts.mk file 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
    @@ -98,8 +100,7 @@ pdk.version=1.0
       #
       # include more board specific stuff here? Such as Audio parameters.      
       #
    - - Additional Android.mk parameters +
  • To create a second product for the same board, create a second product-specific make file called vendor/company_name/products/<second_product_name>.mk that includes:
    diff --git a/pdk/docs/guide/build_system.jd b/pdk/docs/guide/build_system.jd
    index 4b29202e5..d22998383 100755
    --- a/pdk/docs/guide/build_system.jd
    +++ b/pdk/docs/guide/build_system.jd
    @@ -213,8 +213,8 @@ currently-defined build variants:
             eng 
          
          
    -        This is the default flavor. A plain "make" is the
    -        same as "make eng".
    +        This is the default flavor. A plain make is the
    +        same as make eng.
             
    • Installs modules tagged with: eng, debug, user, and/or development. @@ -232,7 +232,7 @@ currently-defined build variants: user - "make user" + make user

      This is the flavor intended to be the final release bits.

        @@ -250,7 +250,7 @@ currently-defined build variants: userdebug - "make userdebug" + make userdebug

        The same as user, except:

          @@ -263,7 +263,7 @@ currently-defined build variants:

          If you build one flavor and then want to build another, you should run -"make installclean" between the two makes to guarantee that -you don't pick up files installed by the previous flavor. "make -clean" will also suffice, but it takes a lot longer. +make installclean between the two makes to guarantee that +you don't pick up files installed by the previous flavor. make +clean will also suffice, but it takes a lot longer.

          \ No newline at end of file diff --git a/pdk/docs/guide/pdk_toc.cs b/pdk/docs/guide/pdk_toc.cs index f98f19489..82f9e8694 100644 --- a/pdk/docs/guide/pdk_toc.cs +++ b/pdk/docs/guide/pdk_toc.cs @@ -8,11 +8,14 @@ function nothing() {}
        • Setup and Building

        • diff --git a/pdk/docs/guide/sensors.jd b/pdk/docs/guide/sensors.jd index 02f0c4e85..d41dcd753 100755 --- a/pdk/docs/guide/sensors.jd +++ b/pdk/docs/guide/sensors.jd @@ -34,7 +34,8 @@ The types of sensors currently supported by Android include: libsensors.so so that it will get loaded from /system/lib at runtime.

          -

          The following stub Android.mk file ensures that libsensors compiles and links to the appropriate libraries:

          +

          The following stub file, Android.mk, ensures that libsensors compiles and links to the appropriate libraries:

          +
           LOCAL_PATH := $(call my-dir)
           include $(CLEAR_VARS)
          diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
          index 4e21c35bd..988866f3f 100644
          --- a/testrunner/test_defs.xml
          +++ b/testrunner/test_defs.xml
          @@ -180,6 +180,13 @@ Native tests:
               coverage_target="framework"
               continuous="true" />
           
          +
          +
           
           
            mListeners = new ArrayList();
           
          +    private Display mDisplay;
          +
               public interface ISdkListener {
                   void onSdkChange();
               }
          @@ -81,6 +83,10 @@ class UpdaterData {
                   return mOsSdkRoot;
               }
           
          +    public void setDisplay(Display display) {
          +        mDisplay = display;
          +    }
          +
               public void setTaskFactory(ITaskFactory taskFactory) {
                   mTaskFactory = taskFactory;
               }
          @@ -166,6 +172,7 @@ class UpdaterData {
                   }
           
                   // notify adapters?
          +        mLocalSdkParser.clearPackages();
                   // TODO
           
                   // notify listeners
          @@ -192,9 +199,8 @@ class UpdaterData {
                * 

          This can be called from any thread. */ public void notifyListeners() { - Display display = Display.getCurrent(); - if (display != null && mListeners.size() > 0) { - display.syncExec(new Runnable() { + if (mDisplay != null && mListeners.size() > 0) { + mDisplay.syncExec(new Runnable() { public void run() { for (ISdkListener listener : mListeners) { try { @@ -265,6 +271,9 @@ class UpdaterData { monitor.setDescription("Done. %1$d %2$s installed.", numInstalled, numInstalled == 1 ? "package" : "packages"); + + //notify listeners something was installed, so that they can refresh + reloadSdk(); } } }); diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java index 0d1ead005..d9eac5cea 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterWindowImpl.java @@ -105,6 +105,7 @@ public class UpdaterWindowImpl { onAndroidSdkUpdaterDispose(); //$hide$ (hide from SWT designer) } }); + mUpdaterData.setDisplay(mAndroidSdkUpdater.getDisplay()); FillLayout fl; mAndroidSdkUpdater.setLayout(fl = new FillLayout(SWT.HORIZONTAL));