OSDN Git Service
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:14 +0000 (17:12 -0700)]
Merge donut into master
Mike Ritter [Wed, 22 Apr 2009 20:45:33 +0000 (13:45 -0700)]
Merge branch 'readonly-p4-donut' into donut
Mike Ritter [Wed, 22 Apr 2009 20:44:21 +0000 (13:44 -0700)]
AI 147382: am: CL 147379 copy pdk templates sub-directories also.
Original author: mritter
Merged from: //branches/cupcake/...
Automated import of CL 147382
Jean-Michel Trivi [Wed, 22 Apr 2009 20:17:57 +0000 (13:17 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jean-Michel Trivi [Wed, 22 Apr 2009 20:16:35 +0000 (13:16 -0700)]
AI 147301: am: CL 147296 Reuse the JetPlayer singleton instance in the initialization of JetBoy instead of destroying it.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 147301
Mike Ritter [Wed, 22 Apr 2009 17:01:48 +0000 (10:01 -0700)]
Merge branch 'readonly-p4-master'
Mike Ritter [Wed, 22 Apr 2009 17:00:01 +0000 (10:00 -0700)]
AI 147383: am: CL 147382 am: CL 147379 copy pdk templates sub-directories also.
Original author: mritter
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147383
Jean-Michel Trivi [Wed, 22 Apr 2009 01:57:14 +0000 (18:57 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Wed, 22 Apr 2009 01:56:24 +0000 (18:56 -0700)]
AI 147304: am: CL 147301 am: CL 147296 Reuse the JetPlayer singleton instance in the initialization of JetBoy instead of destroying it.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147304
Xavier Ducrohet [Tue, 21 Apr 2009 23:24:06 +0000 (16:24 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 21 Apr 2009 23:24:03 +0000 (16:24 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Tue, 21 Apr 2009 23:22:51 +0000 (16:22 -0700)]
AI 147271: am: CL 147269 Remove "show compass" option as it requires Google Maps dependency.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147271
Xavier Ducrohet [Tue, 21 Apr 2009 23:22:37 +0000 (16:22 -0700)]
AI 147272: am: CL 147271 am: CL 147269 Remove "show compass" option as it requires Google Maps dependency.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147272
Raphael Moll [Tue, 21 Apr 2009 22:51:07 +0000 (15:51 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 22:50:54 +0000 (15:50 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 22:49:49 +0000 (15:49 -0700)]
AI 147264: am: CL 147262 ADT #
1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147264
Raphael Moll [Tue, 21 Apr 2009 22:49:27 +0000 (15:49 -0700)]
AI 147265: am: CL 147264 am: CL 147262 ADT #
1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147265
Jeff Hamilton [Tue, 21 Apr 2009 22:13:43 +0000 (15:13 -0700)]
Merge branch 'readonly-p4-master'
Jeff Hamilton [Tue, 21 Apr 2009 22:12:09 +0000 (15:12 -0700)]
AI 147251: am: CL 147247 am: CL 147243 Make the API sample check to see if there is anything installed to handle the recognition intent.
Original author: jham
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147251
Jeff Hamilton [Tue, 21 Apr 2009 22:10:49 +0000 (15:10 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jeff Hamilton [Tue, 21 Apr 2009 22:09:35 +0000 (15:09 -0700)]
AI 147247: am: CL 147243 Make the API sample check to see if there is anything installed to handle the recognition intent.
Original author: jham
Merged from: //branches/cupcake/...
Automated import of CL 147247
Raphael Moll [Tue, 21 Apr 2009 20:26:55 +0000 (13:26 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:25:35 +0000 (13:25 -0700)]
AI 147194: am: CL 147193 am: CL 147190 Javadoc for MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147194
Raphael Moll [Tue, 21 Apr 2009 20:24:01 +0000 (13:24 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:22:51 +0000 (13:22 -0700)]
AI 147193: am: CL 147190 Javadoc for MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147193
Raphael Moll [Tue, 21 Apr 2009 20:12:00 +0000 (13:12 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:10:40 +0000 (13:10 -0700)]
AI 147181: am: CL 147177 am: CL 147175 ADT #
1801951: "adb.exe" misses the dot in android_rules.xml
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147181
Raphael Moll [Tue, 21 Apr 2009 20:09:20 +0000 (13:09 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:08:08 +0000 (13:08 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:07:50 +0000 (13:07 -0700)]
AI 147177: am: CL 147175 ADT #
1801951: "adb.exe" misses the dot in android_rules.xml
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147177
Raphael Moll [Tue, 21 Apr 2009 20:06:35 +0000 (13:06 -0700)]
AI 147180: am: CL 147176 am: CL 147174 ADT #
1801919: Make default options output a bit more friendly.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147180
Raphael Moll [Tue, 21 Apr 2009 20:06:05 +0000 (13:06 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:04:49 +0000 (13:04 -0700)]
AI 147176: am: CL 147174 ADT #
1801919: Make default options output a bit more friendly.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147176
Andy Stadler [Tue, 21 Apr 2009 18:55:42 +0000 (11:55 -0700)]
Merge branch 'readonly-p4-master'
Andy Stadler [Tue, 21 Apr 2009 18:54:13 +0000 (11:54 -0700)]
AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
package manager package name (not the java package name, and
not the test package) of the package holding the Activity
under test.
Added similar notations to the ApiDemos call sites.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147169
Andy Stadler [Tue, 21 Apr 2009 18:53:02 +0000 (11:53 -0700)]
Merge branch 'readonly-p4-donut' into donut
Andy Stadler [Tue, 21 Apr 2009 18:51:42 +0000 (11:51 -0700)]
AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
package manager package name (not the java package name, and
not the test package) of the package holding the Activity
under test.
Added similar notations to the ApiDemos call sites.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Automated import of CL 147167
Raphael Moll [Mon, 20 Apr 2009 23:20:10 +0000 (16:20 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Mon, 20 Apr 2009 23:18:59 +0000 (16:18 -0700)]
AI 147029: am: CL 147027 am: CL 147025 ADT #
1795718: disable --mode in "android create project".
The alias build rules do not work and the flag wasn't even used
by ProjectCreator anyway. Will reintroduce later.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147029
Raphael Moll [Mon, 20 Apr 2009 23:16:34 +0000 (16:16 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Mon, 20 Apr 2009 23:15:15 +0000 (16:15 -0700)]
AI 147027: am: CL 147025 ADT #
1795718: disable --mode in "android create project".
The alias build rules do not work and the flag wasn't even used
by ProjectCreator anyway. Will reintroduce later.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147027
Raphael Moll [Mon, 20 Apr 2009 22:44:16 +0000 (15:44 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Mon, 20 Apr 2009 22:43:27 +0000 (15:43 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Mon, 20 Apr 2009 22:42:50 +0000 (15:42 -0700)]
AI 147015: am: CL 147013 am: CL 147012 A readme describing the usage and limitations of MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147015
Raphael Moll [Mon, 20 Apr 2009 22:41:59 +0000 (15:41 -0700)]
AI 147013: am: CL 147012 A readme describing the usage and limitations of MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147013
Android (Google) Code Review [Mon, 20 Apr 2009 22:29:06 +0000 (15:29 -0700)]
Merge change 285
* changes:
Added single quotes around the shell command sent to the device. Without the quotes, the shell split the command and the echo statement gets dropped.
Android (Google) Code Review [Mon, 20 Apr 2009 22:21:12 +0000 (15:21 -0700)]
Merge change 334
* changes:
Remove the hardwired runner from the MMS test.
Xavier Ducrohet [Mon, 20 Apr 2009 21:13:35 +0000 (14:13 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Mon, 20 Apr 2009 21:12:39 +0000 (14:12 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Mon, 20 Apr 2009 21:12:14 +0000 (14:12 -0700)]
AI 146986: am: CL 146983 am: CL 146980 Fix the display of the target hash string when displaying unresolved target errors.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146986
Xavier Ducrohet [Mon, 20 Apr 2009 21:11:22 +0000 (14:11 -0700)]
AI 146983: am: CL 146980 Fix the display of the target hash string when displaying unresolved target errors.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 146983
Tom Taylor [Mon, 20 Apr 2009 21:11:20 +0000 (14:11 -0700)]
Remove the hardwired runner from the MMS test.
This line has to be removed in order to successfully launch the mms tests.
Raphael Moll [Mon, 20 Apr 2009 20:25:19 +0000 (13:25 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Mon, 20 Apr 2009 20:24:11 +0000 (13:24 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Mon, 20 Apr 2009 20:23:51 +0000 (13:23 -0700)]
AI 146972: am: CL 146970 am: CL 146969 Windows SDK fixes for JetCreator
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146972
Raphael Moll [Mon, 20 Apr 2009 20:22:55 +0000 (13:22 -0700)]
AI 146970: am: CL 146969 Windows SDK fixes for JetCreator
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 146970
Xavier Ducrohet [Mon, 20 Apr 2009 18:03:34 +0000 (11:03 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Mon, 20 Apr 2009 18:02:46 +0000 (11:02 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Mon, 20 Apr 2009 18:02:00 +0000 (11:02 -0700)]
AI 146949: am: CL 146944 am: CL 146943 Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146949
Xavier Ducrohet [Mon, 20 Apr 2009 18:01:18 +0000 (11:01 -0700)]
AI 146944: am: CL 146943 Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 146944
Raphael Moll [Sun, 19 Apr 2009 16:48:55 +0000 (09:48 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 16:48:31 +0000 (09:48 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Sun, 19 Apr 2009 16:47:36 +0000 (09:47 -0700)]
AI 146872: am: CL 146870 am: CL 146865 Final pass on stubber: properly filter fields and methods.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146872
Raphael Moll [Sun, 19 Apr 2009 16:47:11 +0000 (09:47 -0700)]
AI 146870: am: CL 146865 Final pass on stubber: properly filter fields and methods.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 146870
Raphael Moll [Sun, 19 Apr 2009 16:45:08 +0000 (09:45 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 16:44:45 +0000 (09:44 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Sun, 19 Apr 2009 16:43:12 +0000 (09:43 -0700)]
AI 146864: am: CL 146863 am: CL 146862 Fix Windows SDK build.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146864
Raphael Moll [Sun, 19 Apr 2009 16:42:01 +0000 (09:42 -0700)]
AI 146863: am: CL 146862 Fix Windows SDK build.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 146863
Xavier Ducrohet [Sun, 19 Apr 2009 06:33:28 +0000 (23:33 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 06:32:15 +0000 (23:32 -0700)]
AI 146848: am: CL 146847 am: CL 146845 Fix detecting "home" activities when parsing the Android Manifest
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146848
Xavier Ducrohet [Sun, 19 Apr 2009 06:24:56 +0000 (23:24 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 06:23:41 +0000 (23:23 -0700)]
AI 146842: am: CL 146808 am: CL 146806 Make sure we check buffer length when removing escaped chars (like unicode) when parsing Value XML files.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146842
Xavier Ducrohet [Sun, 19 Apr 2009 06:16:30 +0000 (23:16 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 06:15:16 +0000 (23:15 -0700)]
AI 146839: am: CL 146784 am: CL 146783 Update New project wizard with the less confusing "Build Target" label.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146839
Xavier Ducrohet [Sun, 19 Apr 2009 06:13:38 +0000 (23:13 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 06:12:22 +0000 (23:12 -0700)]
AI 146838: am: CL 146778 am: CL 146776 fix NPE in AvdManager
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146838
Raphael Moll [Sun, 19 Apr 2009 06:10:49 +0000 (23:10 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 06:09:36 +0000 (23:09 -0700)]
AI 146836: am: CL 146771 am: CL 146770 ADT #
1797369 fix error "ant windows: com.android.ant.SetupTask cannot be found"
The path in local.properties should be double-backslashed.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146836
Xavier Ducrohet [Sun, 19 Apr 2009 05:56:42 +0000 (22:56 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 05:55:28 +0000 (22:55 -0700)]
AI 146831: am: CL 146750 am: CL 146747 Add the JetCreator tools and docs to the SDK (mac/windows only).
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146831
Raphael Moll [Sun, 19 Apr 2009 05:51:14 +0000 (22:51 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 05:50:00 +0000 (22:50 -0700)]
AI 146829: am: CL 146744 am: CL 146720 ADT Jar Stubber: generate stubbed jar.
This also reorganizes some source so it's 90% refactoring.
There will be more filtering to do in another CL.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146829
Xavier Ducrohet [Sun, 19 Apr 2009 05:42:57 +0000 (22:42 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 05:41:47 +0000 (22:41 -0700)]
AI 146826: am: CL 146740 am: CL 146692 Clean up the output of "android list targets" and fix the image.sysdir.# to only be present if the image folders really contain *.img files.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146826
Xavier Ducrohet [Sun, 19 Apr 2009 05:40:17 +0000 (22:40 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 05:39:06 +0000 (22:39 -0700)]
AI 146825: am: CL 146739 am: CL 146689 Broken AVDs are now loaded by default, and we provide a way to fix one (new) type of error (wrong paths to the system image)
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146825
Xavier Ducrohet [Sun, 19 Apr 2009 05:32:09 +0000 (22:32 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 05:31:03 +0000 (22:31 -0700)]
AI 146822: am: CL 146736 am: CL 146674 "Target" nomenclature fixes
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146822
Jean-Michel Trivi [Sun, 19 Apr 2009 05:18:40 +0000 (22:18 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Sun, 19 Apr 2009 05:17:27 +0000 (22:17 -0700)]
AI 146646: am: CL 146645 am: CL 146643 Clean up and commenting of the JetBoy JET demo code:
Fixed JetPlayer initialization code and pause when the app loses focus.
Removed mute mask hack.
Cleaned up event ID declaration and check (event value is a byte, not a String).
Add extensive comments for the JetPlayer code.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146646
Raphael Moll [Sun, 19 Apr 2009 05:13:13 +0000 (22:13 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 05:12:06 +0000 (22:12 -0700)]
AI 146638: am: CL 146634 am: CL 146631 ADT #
1793333: fix Widget disposed in SdkTargetSelector.
This happens when you open the Windows > Prefs > Android panel
while an SDK is initially loading or when you change the
SDK in the pref panel. The target change listener was not
properly removed since the field was not properly disposed.
This also removed the multiple selection handling in the
SdkTargetSelector, which we never use. In the unlikely event
we want to use it later, it would be trivial to add it back.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146638
Raphael Moll [Sun, 19 Apr 2009 04:57:06 +0000 (21:57 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Sun, 19 Apr 2009 04:55:54 +0000 (21:55 -0700)]
AI 146600: am: CL 146597 am: CL 146595 ADT #
1794560: prevent from loading more than one SDK at once.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146600
Jeffrey Sharkey [Sun, 19 Apr 2009 04:32:40 +0000 (21:32 -0700)]
Merge branch 'readonly-p4-master'
Jeffrey Sharkey [Sun, 19 Apr 2009 04:31:31 +0000 (21:31 -0700)]
AI 146582: am: CL 146481 am: CL 146394 Add ExampleAppWidgetConfigure to manifest and correct update issues.
This adds widget configuration to manifest so we don't crash when trying to insert. We also correctly push a second update once prefix title has been saved; previously we showed a stale title until next widget update. Also return the title prefix correctly for a given appWidgetId.
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146582
Jean-Michel Trivi [Sun, 19 Apr 2009 04:27:16 +0000 (21:27 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Sun, 19 Apr 2009 04:26:04 +0000 (21:26 -0700)]
AI 146580: am: CL 146478 am: CL 146372 Add audio assets used for the generation of the JET data that is used in the JET SDK sample "JetBoy". This includes the JetCreator project and the Logic file for the music.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146580
Xavier Ducrohet [Sun, 19 Apr 2009 04:19:03 +0000 (21:19 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Sun, 19 Apr 2009 04:17:49 +0000 (21:17 -0700)]
AI 146576: am: CL 146352 am: CL 146351 Fix aidl 2 issues: aidl file change for parcelable didnt trigger a recompilation. Folder creation failed if parent folder didn't exist.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146576