Xavier Ducrohet
41d44d30bb
am fd51be7a: am e823f9eb: am cf997049: Fix the Library sample.
2010-05-06 17:43:34 -07:00
Xavier Ducrohet
9409d1c3e8
am 03c7c8b6: am 5542d32c: am fc7428f9: Add the TicTacToe Lib+Main samples
2010-05-06 17:42:06 -07:00
Xavier Ducrohet
fd51be7a7e
am e823f9eb: am cf997049: Fix the Library sample.
...
Merge commit 'e823f9ebc789718ee9061856f1f3951bfec562e1' into kraken
* commit 'e823f9ebc789718ee9061856f1f3951bfec562e1':
Fix the Library sample.
2010-05-06 17:39:57 -07:00
Xavier Ducrohet
e823f9ebc7
am cf997049: Fix the Library sample.
...
Merge commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6' into froyo-plus-aosp
* commit 'cf9970499bfcce80d92c2fe37fd552e586c177b6':
Fix the Library sample.
2010-05-06 17:38:30 -07:00
Xavier Ducrohet
03c7c8b615
am 5542d32c: am fc7428f9: Add the TicTacToe Lib+Main samples
...
Merge commit '5542d32c67e31f4e39ff33904613ec722d42ddd1' into kraken
* commit '5542d32c67e31f4e39ff33904613ec722d42ddd1':
Add the TicTacToe Lib+Main samples
2010-05-06 17:38:24 -07:00
Xavier Ducrohet
5542d32c67
am fc7428f9: Add the TicTacToe Lib+Main samples
...
Merge commit 'fc7428f91254740a245fdac5db77d035c0b4c41f' into froyo-plus-aosp
* commit 'fc7428f91254740a245fdac5db77d035c0b4c41f':
Add the TicTacToe Lib+Main samples
2010-05-06 17:36:56 -07:00
Xavier Ducrohet
cf9970499b
Fix the Library sample.
...
Change-Id: I38d0336b8f1952d4e0424501dcd060d173624b5b
2010-05-06 17:35:35 -07:00
Xavier Ducrohet
fc7428f912
Add the TicTacToe Lib+Main samples
...
Change-Id: I17a26172ab82b2e4b794774c5ab94bed8202b7d4
2010-05-06 16:53:09 -07:00
The Android Open Source Project
39ffffa094
am dd440b40: am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD
2010-05-06 15:35:33 -07:00
The Android Open Source Project
dd440b4067
am 02d92477: Merge commit \'goog/readonly-korg-master\' into HEAD
...
Merge commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05' into kraken
* commit '02d92477d5bd290eb8cd1ef7e13e903520ebba05':
Update sdk.atree with new ant rules location.
2010-05-06 15:16:03 -07:00
The Android Open Source Project
02d92477d5
Merge commit 'goog/readonly-korg-master' into HEAD
2010-05-06 15:07:55 -07:00
Kenny Root
cc5e047e6c
am 3215afae: (-s ours) Update classpath for Eclipse DO NOT MERGE
2010-05-06 13:30:44 -07:00
Kenny Root
3215afaee4
Update classpath for Eclipse DO NOT MERGE
...
Change-Id: Id16bde9c7eef953e7c31f86e8c485a9025294586
2010-05-06 12:01:08 -07:00
Dianne Hackborn
d2d93d0b17
Update fragment samples to show back stacks and layout.
...
Change-Id: I016f87dc3b7433d0600a9a9308f666a36c5a98ca
2010-05-06 11:57:56 -07:00
Xavier Ducrohet
c52dc95107
am 360fba54: Update sdk.atree with new ant rules location.
2010-05-05 17:51:25 -07:00
Xavier Ducrohet
360fba5491
Update sdk.atree with new ant rules location.
...
Change-Id: I8ff92a2343e1a4aa13ad4e8751e2a135eac09425
2010-05-05 15:56:12 -07:00
Xavier Ducrohet
36cb47e677
Update sdk.atree with new ant rules location.
...
Change-Id: I69cd421f36c8ea2b41b3f22f053489ac7dc5e3e9
2010-05-05 14:13:49 -07:00
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