Commit Graph

4050 Commits

Author SHA1 Message Date
The Android Open Source Project
7acf0f3726 merge from open-source master
Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215
2010-06-07 16:30:52 -07:00
Jean-Baptiste Queru
4067dc52e9 Merge "Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers" 2010-06-07 14:29:24 -07:00
Dan Egnor
7e7d75eefd am 27626c03: Add API key to BackupRestore sample code.
Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp

* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
  Add API key to BackupRestore sample code.
2010-06-03 14:08:35 -07:00
Dan Egnor
27626c03e4 Add API key to BackupRestore sample code.
Change-Id: If80cbceffc213fdc6059fe22bf0e24520fba5f2d
Bug: 2735063
2010-06-03 13:38:57 -07:00
The Android Open Source Project
9867f9491c merge from open-source master
Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
2010-06-02 07:45:47 -07:00
The Android Open Source Project
2d75ee4ad0 merge from open-source master
Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90
2010-06-02 07:44:48 -07:00
The Android Open Source Project
aebe000cfa merge from open-source master
Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a
2010-06-02 07:37:13 -07:00
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
Christian Mehlmauer
58ff1585cd Replaced Deprecated GestureDetector API Call
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
2010-05-25 20:17:51 +02: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
Christian Mehlmauer
a3396e0940 Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers
Change-Id: I25add019e99fec88c8422da14f3e18246ca0f0b5
2010-05-21 07:28:31 +02:00
Romain Guy
91cd277060 Merge "removed unused imports" 2010-05-20 22:11:49 -07:00
Romain Guy
8b676d1916 Merge "removed unused imports" 2010-05-20 22:10:43 -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
60a798eff5 removed unused imports
Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0
2010-05-20 21:07:30 +02:00
Christian Mehlmauer
ed674c1ec7 removed unused imports
Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b
2010-05-20 21:06:37 +02: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