The Android Open Source Project
4bdec4ab5d
merge from open-source master
...
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
2010-06-02 07:35:57 -07:00
The Android Open Source Project
032ae72e19
merge from open-source master
...
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921
2010-06-02 07:30:37 -07:00
The Android Open Source Project
43abe820f2
merge from open-source master
...
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
2010-06-02 07:28:32 -07:00
The Android Open Source Project
740c3e2e97
merge from open-source master
...
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
2010-06-02 07:23:24 -07:00
The Android Open Source Project
8cc5a8166d
merge from open-source master
...
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
2010-06-02 07:22:11 -07:00
Yu Shan Emily Lau
59b6dce0d5
am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
...
Merge commit '39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp
* commit '39d7a7451b7e43dc1d71ac983821e76c88775a81':
Added the instrumentation and power log monkey events fro the new power framework.
2010-05-28 15:50:23 -07:00
Yu Shan Emily Lau
39d7a7451b
Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
2010-05-28 15:38:48 -07:00
Yu Shan Emily Lau
2952b49c7c
Added the instrumentation and power log monkey events fro the new power framework.
...
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
2010-05-28 13:48:42 -07:00
Kenny Root
8824549dce
am 99cb1d16: Merge "Spelling fix for source download page" into froyo
...
Merge commit '99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp
* commit '99cb1d16cc609866bb17c729d9b41926924ab4dd':
Spelling fix for source download page
2010-05-26 15:38:05 -07:00
Kenny Root
99cb1d16cc
Merge "Spelling fix for source download page" into froyo
2010-05-26 15:36:27 -07:00
Xavier Ducrohet
6e6c1ebd77
am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
...
Merge commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp
* commit '02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
Move the rev of the froyo sdk component to 2. Do not merge
2010-05-26 13:51:54 -07:00
Xavier Ducrohet
02ad7fc23a
Move the rev of the froyo sdk component to 2. Do not merge
...
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
2010-05-26 13:48:10 -07:00
Dirk Dougherty
d43be56d40
am 3c19d0e0: Doc change: increment androidappdocs version.
...
Merge commit '3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp
* commit '3c19d0e052fae5f21f8e8592143a24919b106743':
Doc change: increment androidappdocs version.
2010-05-24 10:23:08 -07:00
Dirk Dougherty
3c19d0e052
Doc change: increment androidappdocs version.
...
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
2010-05-24 10:17:06 -07:00
Romain Guy
72d89196dd
Merge "removed unused imports"
2010-05-20 22:10:15 -07:00
Romain Guy
c34cbee5b2
Merge "Removed unused import"
2010-05-20 22:09:03 -07:00
Christian Mehlmauer
942e696486
removed unused imports
...
Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27
2010-05-20 21:04:57 +02:00
Christian Mehlmauer
019a7e463b
Removed unused import
...
Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a
2010-05-20 20:35:14 +02:00
Christian Mehlmauer
38dcb296c9
Reduced Warnings
...
Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9
2010-05-20 20:13:51 +02:00
Romain Guy
4b5c09f29e
Merge "Updated deprecated Contacts API to ContactsContract"
2010-05-19 22:06:53 -07:00
Romain Guy
d2e12d0428
Merge "Updated Sensor Samples to newest API"
2010-05-19 22:06:33 -07:00
Christian Mehlmauer
62e6bdb0fe
Updated deprecated Contacts API to ContactsContract
...
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
2010-05-20 06:29:48 +02:00
Christian Mehlmauer
707eb2ffec
Updated Sensor Samples to newest API
...
Change-Id: I88c0ce08232fed34aa99c97385155220e7d9abff
2010-05-19 18:27:34 +02:00
The Android Open Source Project
ca81fb411a
merge from open-source master
...
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
2010-05-19 08:13:51 -07:00
Christian Mehlmauer
9bfa323af1
Corrected StatusBarNotificationSample
...
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
2010-05-18 23:44:32 +02:00
The Android Open Source Project
253290a70f
merge from open-source master
...
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
2010-05-18 10:56:24 -07:00
The Android Open Source Project
c043a97c9f
merge from open-source master
...
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
2010-05-18 09:27:19 -07:00
Christian Mehlmauer
ec867a8c35
Removed bad BuildPaths (not existing Directories after checkout)
...
Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
2010-05-18 06:53:36 +02:00
Jean-Baptiste Queru
0195941e06
Merge "Removed Duplicate Build Paths"
2010-05-17 15:02:56 -07:00
Christian Mehlmauer
b88f42b361
Removed Calls to deprecated API
...
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
2010-05-17 23:43:43 +02:00
Christian Mehlmauer
165b906aa5
Removed Duplicate Build Paths
...
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
2010-05-16 22:46:34 +02:00
The Android Open Source Project
99096976d0
merge from open-source master
...
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
2010-05-12 09:27:49 -07:00
Dirk Dougherty
8bfa91f076
am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
...
Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp
* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
2010-05-11 10:18:43 -07:00
Johan Alfven
f515f1a6c8
Added missing --pct-syskeys to processOptions in Monkey
...
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.
Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
2010-05-11 09:11:43 +02:00
Dirk Dougherty
56c8df1b06
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
...
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
2010-05-10 16:12:24 -07:00
Scott Main
46ea565515
am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
...
Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp
* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
change searchable dictionary folder name back to normal (exclude "v2", which
2010-05-10 13:47:14 -07:00
Scott Main
e7506f8306
am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
...
Merge commit '1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp
* commit '1b2c80841221bb69ca0384974fab462156cfc07d':
add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:47:12 -07:00
Scott Main
6807387d71
change searchable dictionary folder name back to normal (exclude "v2", which
...
should instead be used only for HTML titles)
Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
2010-05-10 12:46:19 -07:00
Scott Main
1b2c808412
add version code and name to searchable dictionary sample (make it v2)
...
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
2010-05-10 12:34:08 -07:00
Xavier Ducrohet
33c1d23b01
am ca2327f1: Merge "Fix target for library sample" into froyo
...
Merge commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp
* commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
Fix target for library sample
2010-05-10 09:43:08 -07:00
Xavier Ducrohet
ca2327f1d4
Merge "Fix target for library sample" into froyo
2010-05-07 10:58:32 -07:00
Xavier Ducrohet
1959000ef1
Fix target for library sample
...
Change-Id: I89a1b6a7c7803ac52f5872e4b8a8696bb32ca5a3
2010-05-07 10:57:58 -07:00
Joe Malin
10cedd234b
am 527cfd6e: Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
...
Merge commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609' into froyo-plus-aosp
* commit '527cfd6ef30a92a679aa2fff3d57f7024cebf609':
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
2010-05-07 09:54:29 -07:00
Joe Malin
527cfd6ef3
Doc change: cherry-pick from master: Files for the Spinner and SpinnerTest sample applications...
...
Change-Id: Ic4a1d28ea821ab7e35255d5a62ca0978cb9155ba
2010-05-07 09:48:47 -07:00
Dirk Dougherty
9e678c26d8
am 2f0b1c13: Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
...
Merge commit '2f0b1c1335f6212889633e170d71c56dba70e78e' into froyo-plus-aosp
* commit '2f0b1c1335f6212889633e170d71c56dba70e78e':
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
2010-05-07 09:20:00 -07:00
Dirk Dougherty
2f0b1c1335
Doc change: cherry-pick from master. ->Subject: Android application files for the Activity Testing Tutorial
...
Conflicts:
build/sdk.atree
Change-Id: I5edb1d4d8a18fbda53a0e78ca6c9d20cf7d3ff4a
2010-05-07 09:16:56 -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
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
