Commit Graph

4059 Commits

Author SHA1 Message Date
Andrew Stadler
43c31b8d1c Various cleanups to classpath
* AlarmClock -> DeskClock
* add android.icu
* frameworks/policies/base/phone -> frameworks/base/policy

Change-Id: If6330decf95c88c16b387792007d62ca28d9180f
2010-05-03 17:31:38 -07:00
The Android Open Source Project
eb09455729 am 22364127: merge from open-source master 2010-05-03 15:31:06 -07:00
The Android Open Source Project
2236412788 merge from open-source master
Change-Id: Iee26d951b665e3cec3487dee026f6b529ea2c64d
2010-05-03 15:25:26 -07:00
Jean-Baptiste Queru
bb645bd59a Adapt to new location of libcore
Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
2010-05-03 13:16:14 -07:00
Joe Malin
bee8cd502f Doc Change: Files for the Spinner and SpinnerTest sample applications, part of Activity Testing tutorial
Change-Id: If9b6f214cdad870257efc34193eed846cde2ec47
2010-04-30 08:42:24 -07:00
The Android Open Source Project
e73e4911f3 am 51ecd212: merge from open-source master 2010-04-28 13:06:48 -07:00
The Android Open Source Project
51ecd212b6 merge from open-source master
Change-Id: I5b1a7e1448dc3bfeb499201e0332de550da1380a
2010-04-28 12:55:21 -07:00
Dan Morrill
d2e340cded Merge "Minor content/messaging changes in advance of final review." 2010-04-28 12:35:57 -07:00
Dan Morrill
d676526591 Minor content/messaging changes in advance of final review.
Change-Id: I0c1b9f85db253a56c1c8daf6239eb9fec44ed124
2010-04-28 12:14:40 -07:00
Xavier Ducrohet
a61e3cd438 Package Ant rules r3
Change-Id: I2c5fca2ac89a54499f243670bbe858affa8770c3
2010-04-27 16:05:41 -07:00
Scott Main
5741824bbf resolved conflicts for merge of 096f06be to master
Change-Id: Ida756c1bee7418224a6bb53266728ec41b984cd2
2010-04-27 12:05:59 -07:00
Bill Napier
bd8baebbca Merge "Refactor ImageUtils to eliminate extra copy of image data that was being done. This yields a small (but noticable) performance improvement." 2010-04-27 10:55:37 -07:00
Bill Napier
397028f8ed Refactor ImageUtils to eliminate extra copy of image data that was being done. This yields a small
(but noticable) performance improvement.

Add in unit tests to validate that ImageUtils works correctly.

Change-Id: I3f5a8512534c0193f99c0e514066dbd02746a6bc
2010-04-27 10:48:13 -07:00
Scott Main
096f06bef2 am 3adbb98d: Merge "title the searchable dictionary app as "v2" because it includes significant changes and it\'s worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)."
Merge commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497' into froyo-plus-aosp

* commit '3adbb98dff3b1cbafcd9aadfc8708f4b88030497':
  title the searchable dictionary app as "v2" because it includes significant
2010-04-27 10:35:50 -07:00
Scott Main
3adbb98dff Merge "title the searchable dictionary app as "v2" because it includes significant changes and it's worth highlighting the revision. some revisions to the sample desciption. a companion change to the resources navigation link will follow (to name it v2)." into froyo 2010-04-27 10:32:44 -07:00
Raphael
8f939fb0cd am 262113ac: am 0e4dd618: Makefile to create Windows SDK under Linux. 2010-04-26 10:11:41 -07:00
Raphael
cdfc198fac am fab98d83: am 67fa3142: Fix etc1tool to build in Windows SDK under Linux 2010-04-26 10:11:39 -07:00
Raphael
262113ac94 am 0e4dd618: Makefile to create Windows SDK under Linux.
Merge commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4' into froyo-plus-aosp

* commit '0e4dd618494c577b8e8dcb0c7f525617b0a72fc4':
  Makefile to create Windows SDK under Linux.
2010-04-23 17:14:56 -07:00
Raphael
fab98d832c am 67fa3142: Fix etc1tool to build in Windows SDK under Linux
Merge commit '67fa314265f47fc9360bcea990d8d67270fdefde' into froyo-plus-aosp

* commit '67fa314265f47fc9360bcea990d8d67270fdefde':
  Fix etc1tool to build in Windows SDK under Linux
2010-04-23 17:14:29 -07:00
Raphael
0e4dd61849 Makefile to create Windows SDK under Linux.
The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.

(Merge master Change Ie24f765b)
2010-04-23 13:16:16 -07:00
Raphael
67fa314265 Fix etc1tool to build in Windows SDK under Linux
(Merges master Change Ib38a019b + Change I50f55004)

Change-Id: I2cbb63f0f20cdd2652b6b64ae0dee4343b952973
2010-04-23 13:12:03 -07:00
Raphael
2a340fa5fd Merge "Makefile to create Windows SDK under Linux." 2010-04-23 09:57:59 -07:00
Scott Main
05bd673250 title the searchable dictionary app as "v2" because it includes significant
changes and it's worth highlighting the revision.
some revisions to the sample desciption.
a companion change to the resources navigation link will follow (to name it v2).

Change-Id: Ib11cae9e4cc753f76b45ae446ef9871fee674e7a
2010-04-23 07:39:05 -07:00
Bill Napier
607f952ed8 Merge "The rest of the refactor to make MonkeyRunner cleaner." 2010-04-21 17:51:42 -07:00
Bill Napier
d66f9370e1 The rest of the refactor to make MonkeyRunner cleaner.
Change-Id: Iac08f166755abd0d3b439023cac8c7d354fdb439
Note: this removes the MonkeyRecorder functionality.  This will be re-added in a later change.
2010-04-21 17:23:34 -07:00
Jean-Baptiste Queru
5c36717f4a am a3799abc: am 8d53a13d: Merge "Add a backup provider for the SDK" into froyo 2010-04-21 12:34:14 -07:00
Jean-Baptiste Queru
a3799abcd4 am 8d53a13d: Merge "Add a backup provider for the SDK" into froyo
Merge commit '8d53a13daf1756dca86ddea8519ac43334e824fe' into froyo-plus-aosp

* commit '8d53a13daf1756dca86ddea8519ac43334e824fe':
  Add a backup provider for the SDK
2010-04-21 12:22:16 -07:00
Jean-Baptiste Queru
8d53a13daf Merge "Add a backup provider for the SDK" into froyo 2010-04-21 12:17:59 -07:00
Scott Main
dd605322d6 am 891b4e9d: am beca3af7: cherry-pick from master: 3c26ae869e 2010-04-21 11:57:59 -07:00
Scott Main
891b4e9d50 am beca3af7: cherry-pick from master: 3c26ae869e
Merge commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e' into froyo-plus-aosp

* commit 'beca3af74d2a5baeba00ada49ba2480d36535f5e':
  cherry-pick from master: 3c26ae869e
2010-04-21 11:42:29 -07:00
Scott Main
beca3af74d cherry-pick from master: 3c26ae869e
new version of the Searchable Dictionary that saves all the words
in an SQLite Database and FTS3 table, then performs all look ups
using the content provider, plus various style modifications.
2010-04-21 10:44:50 -07:00
Bill Napier
0aae2da0ee Merge "Start refactoring MonkeyRunner to be a bit easier to understand." 2010-04-21 10:21:58 -07:00
Bill Napier
addb02a320 Start refactoring MonkeyRunner to be a bit easier to understand.
- Add in ImageUtils (which is basically a copy from HierarchyViewer)
- Encapsulate ADB communications inside DebugBridge.
- Encapsulate Network Monkey protocol inside MonkeyMananger

Most of this code is currenlty duplicated in MonkeyRunner.java.  Deletions of that code
will come in a subsequent change.

Change-Id: Ia33eeae9b12d97371781c5d2a0292b738130b4d3
2010-04-21 10:12:09 -07:00
Jean-Baptiste Queru
486681280e Add a backup provider for the SDK
Bug: 2611374
Change-Id: I3907a48b2ec380b3f7c3bc168d0529809e098cf7
2010-04-21 09:35:02 -07:00
The Android Open Source Project
58f6c80ad8 am d428e48a: merge from open-source master 2010-04-21 09:24:06 -07:00
The Android Open Source Project
d428e48aa1 merge from open-source master
Change-Id: Ia811827c7fce6b14ec6f8f9dc5f5305be6138127
2010-04-21 09:10:10 -07:00
Raphael
16ede62379 Makefile to create Windows SDK under Linux.
The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.

Change-Id: Ie24f765bbe5201266efcb1c4cdcdead4ced35ef6
2010-04-20 17:02:30 -07:00
Guang Zhu
8aff3602e7 code coverage improvement
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards

Change-Id: I6f1beacdd266310c481351165a054dca8f8657b2
2010-04-20 16:24:27 -07:00
Raphael Moll
3d96f18dd1 Update the docs explaining how to build an SDK.
Change-Id: Ibb2ddb751ac6779b6bbbbcf4cb610d4d86280fee
2010-04-19 15:31:07 -07:00
Dianne Hackborn
5a076f43d5 First simple Fragment API demo.
Change-Id: I8d21485bc12445fe8a670796ddbc3e5ef57fd390
2010-04-19 15:09:36 -07:00
Dirk Dougherty
0fe7b49f21 Merge "Subject: Android application files for the Activity Testing Tutorial Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c" 2010-04-19 11:39:45 -07:00
Joe Malin
7a092deb31 Subject: Android application files for the Activity Testing Tutorial
Change-ID: If1b96a211487f43df76912bdbaf3568c1878478c
2010-04-19 10:43:51 -07:00
Brett Chabot
d2a81ffb99 Merge "Runtest support for tests that need 'make' not 'mmm' to build." 2010-04-16 15:16:04 -07:00
Brett Chabot
8dc9eb8ba6 Runtest support for tests that need 'make' not 'mmm' to build.
Change-Id: I0508db2578826249f9bf4756d5adc6f95e841231
2010-04-16 14:44:41 -07:00
The Android Open Source Project
ecedc3be27 am 03f73ba4: merge from open-source master 2010-04-16 12:47:48 -07:00
The Android Open Source Project
03f73ba453 merge from open-source master
Change-Id: I160f8677dc9fb144b3a3190ee4ea500cad71af2b
2010-04-16 12:36:27 -07:00
Raphael
0db059b4c8 Fix etc1tool on Mac SDK: -lz was missing.
Change-Id: I50f5500493be638182d3302cae2e2385722da22d
2010-04-15 22:02:08 -07:00
Xavier Ducrohet
728457dc74 Fix instructions on how to build the doc.
Change-Id: Id9cde46b38a74f0f6ee368fdc43aee8ec6082b5f
2010-04-15 17:26:58 -07:00
Ying Wang
036e1ea402 am c05b83d1: am 84086578: Add timestamp to monkey log 2010-04-15 13:30:30 -07:00
Brian Carlstrom
90218acfdf runtest --path fails with symlinked ANDROID_BUILD_TOP
While reproducing b/2558977 I found that "runtest --path" did not work
for me because my ANDROID_BUILD_TOP contained a symlink. This is a
local fix to make FindTests use os.path.realpath instead of only half
using os.path.abspath when trying to make canonical paths to compare.

Change-Id: Ief353f52cb80b1798edc3c1233d1e082d9cebc26
2010-04-15 10:36:05 -07:00