OSDN Git Service
The Android Open Source Project [Sun, 29 Mar 2009 15:55:20 +0000 (08:55 -0700)]
Merge branch 'open_source' into google_internal
Xavier Ducrohet [Sat, 28 Mar 2009 03:06:23 +0000 (20:06 -0700)]
AI 143410: am: CL 143408 am: CL 143407 Prevent reinstalling APKs during launch if they have not been recompiled since the previous launch.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143410
Raphael Moll [Sat, 28 Mar 2009 03:01:34 +0000 (20:01 -0700)]
AI 143401: am: CL 143273 am: CL 143259 ADT #
1743364: Refactor all wizard classes & their actions together.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143401
Jack Palevich [Sat, 28 Mar 2009 03:00:31 +0000 (20:00 -0700)]
AI 143400: am: CL 143272 am: CL 143256 Make the Term emulator work with the most recent keyboard IME.
+ Makes the "Enter" key work again.
+ Makes the "Delete" key delete just one character each time you press it
instead of two.
Original author: jackpal
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143400
Xavier Ducrohet [Sat, 28 Mar 2009 02:59:24 +0000 (19:59 -0700)]
AI 143399: am: CL 143270 am: CL 143149 Make ADT look for javadoc in docs/reference for the optional libraries (to match the base docs).
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143399
Xavier Ducrohet [Sat, 28 Mar 2009 02:58:10 +0000 (19:58 -0700)]
AI 143398: am: CL 143269 am: CL 143143 Update ADT changes.txt with JUnit features, and properly restrict ADT package access.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143398
Raphael Moll [Sat, 28 Mar 2009 02:29:45 +0000 (19:29 -0700)]
AI 143373: am: CL 143223 am: CL 143034 ADT #
1738834: Properly validate project name, package name and
activity name for "create project".
Also validate AVD name for "create avd".
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143373
Dianne Hackborn [Sat, 28 Mar 2009 02:26:11 +0000 (19:26 -0700)]
AI 143370: am: CL 143220 am: CL 143022 New spare parts feature. Spare parts is only in engineering builds, so I am hoping it is okay to check in -- it's the same as updating sample code etc.
Original author: hackbod
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143370
Xavier Ducrohet [Sat, 28 Mar 2009 02:11:10 +0000 (19:11 -0700)]
AI 143357: am: CL 143206 am: CL 142994 Clean up official ApiDemos to not reference Google Maps
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143357
Mike Lockwood [Sat, 28 Mar 2009 02:08:42 +0000 (19:08 -0700)]
AI 143355: am: CL 143204 am: CL 142988 Remove emulator support from user builds.
Saves us 52K in /system partition.
BUG=
1739507
Original author: lockwood
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143355
Raphael Moll [Sat, 28 Mar 2009 02:02:53 +0000 (19:02 -0700)]
AI 143350: am: CL 143199 am: CL 142978 ADT #
1738393: fix typo in launch controller.
Also fixed some javadoc warnings.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143350
Evan Millar [Sat, 28 Mar 2009 01:51:49 +0000 (18:51 -0700)]
AI 143341: am: CL 143190 am: CL 142951 Change the way we handle monkey throttling. We now will only sleep after complete down/[move]/up sequences. This avoids unwanted long pressing. We will need to add code to explicitly long press at some point.
Original author: emillar
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143341
The Android Open Source Project [Sat, 28 Mar 2009 01:48:30 +0000 (18:48 -0700)]
Merge commit 'goog/cupcake'
Xavier Ducrohet [Sat, 28 Mar 2009 01:28:38 +0000 (18:28 -0700)]
AI 143407: Prevent reinstalling APKs during launch if they have not been recompiled since the previous launch.
BUG=
1743026
Automated import of CL 143407
Raphael Moll [Sat, 28 Mar 2009 00:54:21 +0000 (17:54 -0700)]
AI 143304: am: CL 143157 am: CL 142852 ADT fix #
1682502: New XML File Wizard root combo is sometimes empty.
Two issues in fact:
1- On some selections the resource type is determined before the
root values are computed.
2- Added an sdk target change listener to refresh the project's roots
if the SDK was still loading or if the project changed targets.
The New Project Wizard has been updated with a similar sdk change
listener to refresh the target selector. This is useful when the NPW
is used before the targets have finished loading, e.g. upon lauching
Eclipse.
Note: this requires CL 142690 to compile.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143304
Raphael Moll [Sat, 28 Mar 2009 00:53:01 +0000 (17:53 -0700)]
AI 143303: am: CL 143156 am: CL 142851 ADT GLE fix #
1731389: widgets dropped in <merge> lack their default layout_widht/height.
Issue: <merge> did not have layout attributes. When new widgets are
dropped in a layout, GLE only adds layout width/height if the parent
supports them.
Fix: Make <merge> have layout attributes from FrameLayout. The ideal
choice would have been ViewGroup, but since ViewGroup is abstract we
don't have any ViewDescriptor for it. FrameLayout should provide a
sensible replacement.
Note: this requires CL 142780 to compile.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143303
Raphael Moll [Fri, 27 Mar 2009 23:06:03 +0000 (16:06 -0700)]
AI 143259: ADT #
1743364: Refactor all wizard classes & their actions together.
BUG=
1743364
Automated import of CL 143259
Jack Palevich [Fri, 27 Mar 2009 22:49:45 +0000 (15:49 -0700)]
AI 143256: Make the Term emulator work with the most recent keyboard IME.
+ Makes the "Enter" key work again.
+ Makes the "Delete" key delete just one character each time you press it
instead of two.
BUG=
1615131
Automated import of CL 143256
The Android Open Source Project [Fri, 27 Mar 2009 22:30:35 +0000 (15:30 -0700)]
Merge commit 'korg/cupcake'
Xavier Ducrohet [Fri, 27 Mar 2009 22:05:58 +0000 (15:05 -0700)]
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
Xavier Ducrohet [Fri, 27 Mar 2009 21:31:26 +0000 (14:31 -0700)]
AI 143143: Update ADT changes.txt with JUnit features, and properly restrict ADT package access.
BUG=
1743054
Automated import of CL 143143
Raphael Moll [Fri, 27 Mar 2009 01:38:21 +0000 (18:38 -0700)]
Automated import from //branches/cupcake/...@143034,143034
Dianne Hackborn [Fri, 27 Mar 2009 00:27:02 +0000 (17:27 -0700)]
Automated import from //branches/cupcake/...@143022,143022
Xavier Ducrohet [Thu, 26 Mar 2009 22:29:07 +0000 (15:29 -0700)]
Automated import from //branches/cupcake/...@142994,142994
Mike Lockwood [Thu, 26 Mar 2009 21:44:25 +0000 (14:44 -0700)]
Automated import from //branches/cupcake/...@142988,142988
Raphael Moll [Thu, 26 Mar 2009 20:53:00 +0000 (13:53 -0700)]
Automated import from //branches/cupcake/...@142978,142978
Evan Millar [Thu, 26 Mar 2009 18:36:18 +0000 (11:36 -0700)]
Automated import from //branches/cupcake/...@142951,142951
Raphael Moll [Thu, 26 Mar 2009 04:11:59 +0000 (21:11 -0700)]
Automated import from //branches/cupcake/...@142852,142852
Raphael Moll [Thu, 26 Mar 2009 04:11:04 +0000 (21:11 -0700)]
Automated import from //branches/cupcake/...@142851,142851
Raphael Moll [Wed, 25 Mar 2009 22:57:47 +0000 (15:57 -0700)]
Automated import from //branches/master/...@142745,142745
Raphael Moll [Wed, 25 Mar 2009 22:56:43 +0000 (15:56 -0700)]
Automated import from //branches/master/...@142744,142744
Raphael Moll [Wed, 25 Mar 2009 22:55:29 +0000 (15:55 -0700)]
Automated import from //branches/master/...@142743,142743
Jack Palevich [Wed, 25 Mar 2009 22:16:49 +0000 (15:16 -0700)]
Automated import from //branches/master/...@142658,142658
Jean-Baptiste Queru [Wed, 25 Mar 2009 22:05:49 +0000 (15:05 -0700)]
Automated import from //branches/master/...@142574,142574
Raphael Moll [Wed, 25 Mar 2009 22:04:55 +0000 (15:04 -0700)]
Automated import from //branches/cupcake/...@142586,142586
Raphael Moll [Wed, 25 Mar 2009 22:03:39 +0000 (15:03 -0700)]
Automated import from //branches/cupcake/...@142585,142585
Raphael Moll [Wed, 25 Mar 2009 22:02:20 +0000 (15:02 -0700)]
Automated import from //branches/cupcake/...@142584,142584
Fred Quintana [Wed, 25 Mar 2009 05:48:10 +0000 (22:48 -0700)]
Automated import from //branches/master/...@142414,142414
Raphael Moll [Wed, 25 Mar 2009 05:30:00 +0000 (22:30 -0700)]
Automated import from //branches/master/...@142292,142292
Raphael Moll [Wed, 25 Mar 2009 05:29:25 +0000 (22:29 -0700)]
Automated import from //branches/master/...@142288,142288
Raphael Moll [Wed, 25 Mar 2009 04:01:03 +0000 (21:01 -0700)]
Automated import from //branches/master/...@141824,141824
Brett Chabot [Wed, 25 Mar 2009 03:59:05 +0000 (20:59 -0700)]
Automated import from //branches/master/...@141818,141818
Xavier Ducrohet [Wed, 25 Mar 2009 03:57:46 +0000 (20:57 -0700)]
Automated import from //branches/master/...@141811,141811
Brett Chabot [Wed, 25 Mar 2009 03:54:44 +0000 (20:54 -0700)]
Automated import from //branches/master/...@141783,141783
Jeff Hamilton [Wed, 25 Mar 2009 03:50:42 +0000 (20:50 -0700)]
Automated import from //branches/master/...@141739,141739
Xavier Ducrohet [Wed, 25 Mar 2009 03:36:56 +0000 (20:36 -0700)]
Automated import from //branches/master/...@141596,141596
Xavier Ducrohet [Wed, 25 Mar 2009 03:33:11 +0000 (20:33 -0700)]
Automated import from //branches/master/...@141558,141558
Ricky Ng-Adam [Wed, 25 Mar 2009 03:27:43 +0000 (20:27 -0700)]
Automated import from //branches/master/...@141519,141519
Ricky Ng-Adam [Wed, 25 Mar 2009 03:26:27 +0000 (20:26 -0700)]
Automated import from //branches/master/...@141511,141511
Raphael Moll [Wed, 25 Mar 2009 03:24:09 +0000 (20:24 -0700)]
Automated import from //branches/master/...@141483,141483
Jack Palevich [Wed, 25 Mar 2009 03:22:52 +0000 (20:22 -0700)]
Automated import from //branches/cupcake/...@142485,142485
Brett Chabot [Wed, 25 Mar 2009 03:21:14 +0000 (20:21 -0700)]
Automated import from //branches/master/...@141464,141464
Ricky Ng-Adam [Wed, 25 Mar 2009 03:14:26 +0000 (20:14 -0700)]
Automated import from //branches/master/...@141414,141414
Raphael Moll [Wed, 25 Mar 2009 02:15:35 +0000 (19:15 -0700)]
Automated import from //branches/cupcake/...@142191,142191
Raphael Moll [Wed, 25 Mar 2009 02:14:49 +0000 (19:14 -0700)]
Automated import from //branches/cupcake/...@142190,142190
Dianne Hackborn [Wed, 25 Mar 2009 01:36:42 +0000 (18:36 -0700)]
Automated import from //branches/master/...@140824,140824
Raphael Moll [Wed, 25 Mar 2009 01:27:05 +0000 (18:27 -0700)]
Automated import from //branches/cupcake/...@141822,141822
Brett Chabot [Wed, 25 Mar 2009 01:25:24 +0000 (18:25 -0700)]
Automated import from //branches/cupcake/...@141814,141814
Xavier Ducrohet [Wed, 25 Mar 2009 01:24:44 +0000 (18:24 -0700)]
Automated import from //branches/cupcake/...@141808,141808
Brett Chabot [Wed, 25 Mar 2009 01:21:57 +0000 (18:21 -0700)]
Automated import from //branches/cupcake/...@141778,141778
Xavier Ducrohet [Wed, 25 Mar 2009 01:20:00 +0000 (18:20 -0700)]
Automated import from //branches/master/...@140724,140724
Jeff Hamilton [Wed, 25 Mar 2009 01:16:44 +0000 (18:16 -0700)]
Automated import from //branches/cupcake/...@141732,141732
Xavier Ducrohet [Wed, 25 Mar 2009 01:15:58 +0000 (18:15 -0700)]
Automated import from //branches/master/...@140701,140701
Xavier Ducrohet [Wed, 25 Mar 2009 01:15:09 +0000 (18:15 -0700)]
Automated import from //branches/master/...@140698,140698
Xavier Ducrohet [Wed, 25 Mar 2009 00:57:45 +0000 (17:57 -0700)]
Automated import from //branches/cupcake/...@141592,141592
Brett Chabot [Wed, 25 Mar 2009 00:44:42 +0000 (17:44 -0700)]
Automated import from //branches/master/...@140469,140469
Brett Chabot [Wed, 25 Mar 2009 00:44:09 +0000 (17:44 -0700)]
Automated import from //branches/master/...@140468,140468
Xavier Ducrohet [Wed, 25 Mar 2009 00:27:48 +0000 (17:27 -0700)]
Automated import from //branches/cupcake/...@141556,141556
Scott Tsai [Sat, 21 Mar 2009 00:17:41 +0000 (08:17 +0800)]
q2dm: correctly expect the return type of strchr(const char*) to be
'const char*' in C++ so that the code builds on gcc-4.4
ISO C++ overloads strchr() so that strchr(const char*) return 'const
char*' and strchr(char *) return 'char *'.
Since DmTrace::parseAndAddFunction really wants to write to its 'const
char *name' argument I just casted a pointer pointing inside of 'name' to 'char*'
Scott Tsai [Fri, 20 Mar 2009 23:41:30 +0000 (07:41 +0800)]
Correctly expect the return value of rindex(const char*) to be of type
'const char*' to make the code build on gcc-4.4.
The C++ spec overloads string fucntions like strtsr and rindex so that
rindex(char *) returns 'char*' and rindex(const char*) returns 'const
char*'.
Without this patch you get an "invalid conversion from ‘const char*’ to
‘char*’" error on gcc-4.4
The Android Open Source Project [Fri, 20 Mar 2009 06:08:36 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 05:20:25 +0000 (22:20 -0700)]
auto import //branches/master/...@140412
The Android Open Source Project [Thu, 19 Mar 2009 00:39:43 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Wed, 18 Mar 2009 23:57:28 +0000 (16:57 -0700)]
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
The Android Open Source Project [Fri, 13 Mar 2009 20:04:19 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:54 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Mon, 9 Mar 2009 18:52:11 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Fri, 6 Mar 2009 04:00:41 +0000 (20:00 -0800)]
auto import from //depot/cupcake/@136745
The Android Open Source Project [Fri, 6 Mar 2009 01:04:45 +0000 (17:04 -0800)]
auto import from //depot/cupcake/@136654
The Android Open Source Project [Thu, 5 Mar 2009 22:34:30 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:29:09 +0000 (19:29 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:16 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:03:58 +0000 (14:03 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:20 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:28 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:29 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:48 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
Adrian Taylor [Thu, 12 Feb 2009 17:22:57 +0000 (17:22 +0000)]
Improving comments in make_windows_sdk.sh.
This commit adds notes about some cygwin packages which I found were
required, and a few other things which cropped up. It has no functional
changes.
List of packages amended as per request by Raphael Moll
(ralf@android.com).
The Android Open Source Project [Tue, 10 Feb 2009 23:43:58 +0000 (15:43 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:15:57 +0000 (00:15 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:40 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:05:23 +0000 (14:05 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Tue, 20 Jan 2009 22:03:55 +0000 (14:03 -0800)]
auto import from //branches/cupcake/...@127101
android-build SharedAccount [Fri, 16 Jan 2009 00:15:47 +0000 (16:15 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:07 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 02:26:25 +0000 (18:26 -0800)]
auto import from //branches/cupcake/...@125939
The Android Open Source Project [Sat, 10 Jan 2009 01:51:19 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939
Jean-Baptiste Queru [Fri, 19 Dec 2008 16:04:59 +0000 (08:04 -0800)]
Merge commit 'remotes/korg/cupcake'
Conflicts:
build/sdk.atree
ide/eclipse/.classpath
tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
tools/eclipse/scripts/create_adt_symlinks.sh
tools/eclipse/scripts/create_all_symlinks.sh
tools/eclipse/scripts/create_bridge_symlinks.sh
tools/eclipse/scripts/create_common_symlinks.sh
tools/eclipse/scripts/create_ddms_symlinks.sh
tools/eclipse/scripts/create_editors_symlinks.sh
tools/eclipse/scripts/create_test_symlinks.sh
tools/scripts/build.template
The Android Open Source Project [Thu, 18 Dec 2008 02:04:04 +0000 (18:04 -0800)]
Code drop from //branches/cupcake/...@124589
Xavier Ducrohet [Fri, 5 Dec 2008 19:36:35 +0000 (11:36 -0800)]
Update the Eclipse plugin README with new instructions on how to compile the plug-ins.