Dirk Dougherty
90e47bb9aa
Merge branch 'readonly-p4-master'
2009-04-21 15:04:33 -07:00
Dirk Dougherty
9daf96a377
AI 147242: am: CL 147239 am: CL 147238 Update tools index, replace activitycreator with android
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147242
2009-04-21 15:03:07 -07:00
Dirk Dougherty
c0bfdd6bb9
Merge branch 'readonly-p4-master'
2009-04-21 14:57:48 -07:00
Dirk Dougherty
901305d0a1
AI 147236: am: CL 147230 am: CL 147228 Add API diff report to SDK docs (API Level 2 to 3)
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147236
2009-04-21 14:56:21 -07:00
Scott Main
22a233f928
Merge branch 'readonly-p4-master'
2009-04-21 14:30:39 -07:00
Scott Main
1362dad293
AI 147225: am: CL 147224 am: CL 147219 update app-signing doc to include a guide to export a signed APK from ADT
...
Original author: smain
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147225
2009-04-21 14:29:14 -07:00
Dirk Dougherty
d153811233
Merge branch 'readonly-p4-master'
2009-04-21 14:18:43 -07:00
Dirk Dougherty
12af87bb36
AI 147215: am: CL 147214 am: CL 147211 Update emulator doc for new usage with avds.
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147215
2009-04-21 14:17:19 -07:00
Andy Stadler
108ba992b2
Merge branch 'readonly-p4-master'
2009-04-21 11:58:49 -07:00
Andy Stadler
a0cce9b120
AI 147170: am: CL 147168 am: CL 147163 Copy documentation for the various search-by-voice flags that
...
were already listed in attrs.xml into SearchManager.java. Add
a (brief - no time for more) description about how to add search
by voice to apps.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147170
2009-04-21 11:57:29 -07:00
Andy Stadler
e9948b27a0
Merge branch 'readonly-p4-master'
2009-04-21 11:55:49 -07:00
Andy Stadler
72d5de71f2
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
2009-04-21 11:54:14 -07:00
Dirk Dougherty
967945ef00
Merge branch 'readonly-p4-master'
2009-04-20 21:58:07 -07:00
Dirk Dougherty
65640aa050
AI 147084: am: CL 147083 am: CL 147081 Add document describing AVDs and usage. (doc change only)
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147084
2009-04-20 21:56:46 -07:00
Android (Google) Code Review
414e092db9
Merge change 339
...
* changes:
adding concept of features to accounts
2009-04-20 18:21:44 -07:00
Dirk Dougherty
db818cfc08
Merge branch 'readonly-p4-master'
2009-04-20 17:58:05 -07:00
Dirk Dougherty
2e2c9104b7
AI 147058: am: CL 147054 am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
...
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147058
2009-04-20 17:56:34 -07:00
Android (Google) Code Review
dcd51165a9
Merge change 326
...
* changes:
modify wait mechanism so that it checks whether activity has already finished or not first
2009-04-20 16:54:55 -07:00
Guang Zhu
20b4935f2a
modify wait mechanism so that it checks whether activity has already finished or not first
...
squashed commit of the following:
commit e2c2d1c09475ce2e319b935fb5627c82a7693a9b
Author: Guang Zhu <guangzhu@google.com>
Date: Mon Apr 20 13:33:08 2009 -0700
modify wait mechanism so that it checks whether activity has already finished or not first
This reverts commit deb6e8792dd563916724bbc127a6fe16ffe81647.
commit deb6e8792dd563916724bbc127a6fe16ffe81647
Author: Guang Zhu <guangzhu@google.com>
Date: Mon Apr 20 10:58:52 2009 -0700
changed callback mechanism in TestShellActivity to use condition
2009-04-20 16:47:37 -07:00
Jean-Michel Trivi
486d95f714
Merge branch 'readonly-p4-master'
2009-04-20 16:33:36 -07:00
Jean-Michel Trivi
f3af6a0267
AI 147036: am: CL 147035 am: CL 147032 Finalize JetPlayer javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147036
2009-04-20 16:32:18 -07:00
Marco Nelissen
d3af590f9c
Merge branch 'readonly-p4-master'
2009-04-20 16:17:25 -07:00
Marco Nelissen
6a1fadea85
AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
...
Automated import of CL 147028
2009-04-20 16:16:01 -07:00
Fred Quintana
3326920329
adding concept of features to accounts
2009-04-20 16:06:02 -07:00
Marco Nelissen
e7c71d3a8c
Merge branch 'readonly-p4-master'
2009-04-20 12:49:56 -07:00
Marco Nelissen
e38e90bf22
AI 146964: tabs -> spaces
...
Automated import of CL 146964
2009-04-20 12:48:39 -07:00
Jean-Michel Trivi
e796cfaef8
Merge branch 'readonly-p4-master'
2009-04-20 10:48:16 -07:00
Jean-Michel Trivi
954bbe9fa3
AI 146941: am: CL 146938 am: CL 146937 Finalize AudioRecord javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146941
2009-04-20 10:46:26 -07:00
Android (Google) Code Review
24a4320f9c
Merge change 261
...
* changes:
Enable Application Caches.
2009-04-20 10:04:34 -07:00
Dmitry Shmidt
c421e9ad74
Merge branch 'readonly-p4-master'
2009-04-20 09:54:14 -07:00
Dmitry Shmidt
69d27108e4
AI 146935: am: CL 146934 Make TI Wifi driver choice framework-independent - part 1
...
Original author: dimitrysh
Automated import of CL 146935
2009-04-20 09:52:56 -07:00
Andrei Popescu
60a9a7d055
Enable Application Caches.
2009-04-20 14:23:58 +01:00
Evan Millar
ac9fd3e423
Merge branch 'readonly-p4-master'
2009-04-18 23:36:20 -07:00
Evan Millar
74e258d63e
AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
...
Original author: emillar
Automated import of CL 146854
2009-04-18 23:35:03 -07:00
Dave Sparks
094c065cbb
Merge branch 'readonly-p4-master'
2009-04-18 23:02:23 -07:00
Dave Sparks
1bc5c2645d
AI 146833: am: CL 146755 am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146833
2009-04-18 23:01:09 -07:00
Jean-Michel Trivi
d4fd29e02c
Merge branch 'readonly-p4-master'
2009-04-18 22:59:37 -07:00
Jean-Michel Trivi
3946a2b75b
AI 146832: am: CL 146752 am: CL 146751 Finalize AudioTrack javadoc.
...
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146832
2009-04-18 22:58:18 -07:00
Urs Grob
bddae03fbd
Merge branch 'readonly-p4-master'
2009-04-18 22:48:29 -07:00
Urs Grob
7d41b8c26a
AI 146828: am: CL 146743 am: CL 146711 Enhancing the test runner. Now it filters BrokenTests and only executes tests
...
annotated with SideEffect if the host is running in single test mode.
Also adding some cleanup mechanism and some logcat logging about memory consumption
Original author: ursg
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146828
2009-04-18 22:47:14 -07:00
Dave Sparks
89e2782d71
Merge branch 'readonly-p4-master'
2009-04-18 22:26:57 -07:00
Dave Sparks
32346a89c3
AI 146671: am: CL 146668 am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146671
2009-04-18 22:25:38 -07:00
Dave Sparks
ec9cacad76
Merge branch 'readonly-p4-master'
2009-04-18 22:21:29 -07:00
Dave Sparks
40a9d16087
AI 146658: am: CL 146655 am: CL 146654 Add java docs for SoundPool
...
Original author: davidsparks
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146658
2009-04-18 22:20:18 -07:00
Brandon Ballinger
cd63c7f89a
Merge branch 'readonly-p4-master'
2009-04-18 22:05:19 -07:00
Brandon Ballinger
f1bb004cda
AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
...
Original author: brandonb
Automated import of CL 146615
2009-04-18 22:04:01 -07:00
Dirk Dougherty
fb56fcabda
Merge branch 'readonly-p4-master'
2009-04-18 22:02:32 -07:00
Dirk Dougherty
9c3209db78
AI 146612: am: CL 146610 am: CL 146609 updates to the manifest docs for cupcake: Add "since" notations for elements and some attributes.
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146612
2009-04-18 22:01:18 -07:00
Dirk Dougherty
7ead0f15e4
Merge branch 'readonly-p4-master'
2009-04-18 21:59:48 -07:00
Dirk Dougherty
e330115c30
AI 146604: am: CL 146602 am: CL 146601 Update media formats appendix for cupcake
...
Original author: ddougherty
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146604
2009-04-18 21:58:38 -07:00