Commit Graph

4302 Commits

Author SHA1 Message Date
Christian Mehlmauer
58ff1585cd Replaced Deprecated GestureDetector API Call
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
2010-05-25 20:17:51 +02:00
Dirk Dougherty
b2d652d1c0 am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version.
Merge commit 'd43be56d40a813bedf96203c4b58056c6139eec0' into kraken

* commit 'd43be56d40a813bedf96203c4b58056c6139eec0':
  Doc change: increment androidappdocs version.
2010-05-24 10:25:09 -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
Andy McFadden
26dc36123f Sim fixes.
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master.  sim-eng is useful for verifying the x86 SMP stuff.

Also quieted a compiler warning.

Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
2010-05-21 11:00:14 -07: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
d350cf1bb8 am ca81fb41: merge from open-source master
Merge commit 'ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken

* commit 'ca81fb411afd93378f01e3e13ef482693fd35a73':
  Corrected StatusBarNotificationSample
2010-05-19 08:18:13 -07:00
The Android Open Source Project
ca81fb411a merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
2010-05-19 08:13:51 -07:00
Guang Zhu
1a3ab7bfaf Merge "code coverage improvement (DO NOT MERGE)" into kraken 2010-05-18 18:44:16 -07:00
Dianne Hackborn
689868ac47 Small fix to surface window sample.
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
2010-05-18 18:33:05 -07:00
Christian Mehlmauer
9bfa323af1 Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
2010-05-18 23:44:32 +02:00
Dianne Hackborn
5ee6d7a18c Merge "Add new demo of taking over a window's surface." into kraken 2010-05-18 12:21:39 -07:00
The Android Open Source Project
f8402ac032 am 253290a7: merge from open-source master
Merge commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken

* commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
  Removed bad BuildPaths (not existing Directories after checkout)
2010-05-18 10:59:19 -07:00
The Android Open Source Project
253290a70f merge from open-source master
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
2010-05-18 10:56:24 -07:00
Guang Zhu
863870c168 code coverage improvement (DO NOT MERGE)
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards

Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e
2010-05-18 10:54:47 -07:00
Dianne Hackborn
988a7192ac Add new demo of taking over a window's surface.
Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037
2010-05-18 10:46:32 -07:00
The Android Open Source Project
3dcb1f7ab4 am c043a97c: merge from open-source master
Merge commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken

* commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
  Removed Calls to deprecated API
  Removed Duplicate Build Paths
2010-05-18 09:31:32 -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
08d3110279 am 99096976: merge from open-source master
Merge commit '99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken

* commit '99096976d0ed8436c0eacdefae0ffb606bd573c5':
  Added missing --pct-syskeys to processOptions in Monkey
2010-05-12 09:36:11 -07: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
529ba2e5f2 am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken

* commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
2010-05-11 10:23:32 -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
07155b40b4 am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken

* commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac':
  change searchable dictionary folder name back to normal (exclude "v2", which
2010-05-10 13:48:59 -07:00
Scott Main
689176f33b am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken

* commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6':
  add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:48:57 -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
54d1f9c9cf am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample
2010-05-10 09:47:30 -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