Commit Graph

9938 Commits

Author SHA1 Message Date
Raphael Moll
d9a06fa8a9 am a8fd9e0a: am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit 'a8fd9e0a3bddffb1aa17bc22b86352a1db36160d':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:21:05 -07:00
Raphael Moll
a8fd9e0a3b am 86ef5ca7: Merge "SDK: Ability to generate repos in XSD repository-7."
* commit '86ef5ca7e3cd1a3b8cac77aa645217d3fcdccfab':
  SDK: Ability to generate repos in XSD repository-7.
2012-05-30 15:18:28 -07:00
Raphael Moll
86ef5ca7e3 Merge "SDK: Ability to generate repos in XSD repository-7." 2012-05-30 15:00:11 -07:00
The Android Open Source Project
62f4d9d3a3 Reconcile with jb-release
Change-Id: If7cd3a5fcbf1bfaee64835c6b3ef7bf858f73b88
2012-05-30 10:12:49 -07:00
The Android Automerger
03ffe7fe8a merge in jb-release history after reset to jb-dev 2012-05-30 07:00:17 -07:00
Nick Pelly
3a8d9ff84a am 6cc9755b: Update device for new location provider configs.
* commit '6cc9755baac9cde9b1327cd090c5d6bea6dbbb00':
  Update device for new location provider configs.
2012-05-29 16:22:45 -07:00
Nick Pelly
6cc9755baa Update device for new location provider configs.
Change-Id: I7d3cf81a5ba1ff7e2ac56f125d8b3454a6bd11c4
2012-05-29 15:56:20 -07:00
The Android Open Source Project
dbe899259b Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ie2368fb992d54d2f97abc7de822b122cd8909941
2012-05-29 09:39:24 -07:00
The Android Automerger
4de07346db merge in jb-release history after reset to jb-dev 2012-05-29 08:55:28 -07:00
Xavier Ducrohet
331d69be99 am af0576fc: Merge "Remove outdated PDK." into jb-dev
* commit 'af0576fc765118f791a5eb9cdaaeed07c20b166a':
  Remove outdated PDK.
2012-05-25 13:24:43 -07:00
Xavier Ducrohet
af0576fc76 Merge "Remove outdated PDK." into jb-dev 2012-05-25 13:22:18 -07:00
Marc Blank
1d7f5824ec am 2476301f: Fix up .classpath for Email/Exchange/emailcommon
* commit '2476301f4dce7769b02fe4157f3134254cc1a4d8':
  Fix up .classpath for Email/Exchange/emailcommon
2012-05-25 10:08:41 -07:00
Xavier Ducrohet
1e284c1477 Remove outdated PDK.
Bug: 6557564

Change-Id: I7d413524c43732056d822e5c1a01f0a26147f24b
2012-05-24 16:57:38 -07:00
Marc Blank
2476301f4d Fix up .classpath for Email/Exchange/emailcommon
Change-Id: I7303f13d4544b81e2a2655319f310a3b6c5243b1
2012-05-24 15:29:47 -07:00
The Android Automerger
3bf34b4979 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-24 10:16:18 -07:00
The Android Open Source Project
553e861a42 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: If473fc45ebf7c4abb91113d12ae559be93c8ecdf
2012-05-24 09:01:01 -07:00
Jean-Baptiste Queru
beb1f40d67 am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '34baff19d88679254d82420f798387f92a7fb912':
  Fix old style edit text drawable display error.
2012-05-23 15:06:55 -07:00
Jean-Baptiste Queru
34baff19d8 am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.
2012-05-23 15:04:39 -07:00
Jean-Baptiste Queru
99314f432e Merge "Fix old style edit text drawable display error." 2012-05-23 14:58:09 -07:00
The Android Automerger
422c4b33de merge in jb-release history after reset to jb-dev 2012-05-23 07:00:03 -07:00
Xavier Ducrohet
7dd2f15b87 am 928c7d66: Add API 16 to the SDK API file.
* commit '928c7d668e70ea66e21909918f68c509b6f26b5a':
  Add API 16 to the SDK API file.
2012-05-22 17:17:02 -07:00
Xavier Ducrohet
d9369bd771 am 9649bee7: Update API file with proper content.
* commit '9649bee7b2482f7905f7e1ae33f3dc1052cee7f6':
  Update API file with proper content.
2012-05-22 15:59:06 -07:00
Xavier Ducrohet
928c7d668e Add API 16 to the SDK API file.
Change-Id: I4937aa793fed5efc51e0c4ce127b7193148baa5e
2012-05-22 15:57:58 -07:00
Xavier Ducrohet
9649bee7b2 Update API file with proper content.
This doesn't contain API 16 just yet. This is just a new version
based on reading all the android.jar instead of the text-based
files.

This new mechanism filters out all methods coming from super
classes as well as interfaces in an effort to make the file
smaller.

Change-Id: Ieefa7d01c29944b2b77b22e8cb81ee2e67afd555
2012-05-22 15:24:18 -07:00
The Android Automerger
df56b2a246 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-22 13:22:24 -07:00
The Android Open Source Project
2455c4916e Reconcile with jb-release
Change-Id: Idb05db9a3cd879261a0ea9ed96a433531e0441b4
2012-05-22 13:04:57 -07:00
The Android Automerger
07e7a1f45c merge in jb-release history after reset to jb-dev 2012-05-22 07:00:23 -07:00
Svetoslav Ganov
ef03d1bae6 am 84710bb8: Merge "Updating the accessibility sample due to a security fix." into jb-dev
* commit '84710bb8b0f3b149feb72d4c29dec35a4ccf327d':
  Updating the accessibility sample due to a security fix.
2012-05-21 13:17:13 -07:00
Svetoslav Ganov
84710bb8b0 Merge "Updating the accessibility sample due to a security fix." into jb-dev 2012-05-21 13:13:41 -07:00
The Android Automerger
7a68eb9bc1 merge in jb-release history after reset to jb-dev 2012-05-21 07:00:31 -07:00
Dianne Hackborn
03239663fc am 7d7d2fb6: Merge "A few little tweaks to system ui flag demos." into jb-dev
* commit '7d7d2fb6d6b8c30cd6549b9cb35e9a0d36f87981':
  A few little tweaks to system ui flag demos.
2012-05-20 21:53:24 -07:00
Dianne Hackborn
7d7d2fb6d6 Merge "A few little tweaks to system ui flag demos." into jb-dev 2012-05-20 10:17:58 -07:00
The Android Automerger
66641b03ad merge in jb-release history after reset to jb-dev 2012-05-20 07:39:37 -07:00
The Android Automerger
091f5c3043 merge in jb-release history after reset to jb-dev 2012-05-19 11:42:46 -07:00
The Android Automerger
967d0604a3 merge in jb-release history after reset to jb-dev 2012-05-19 10:05:42 -07:00
Dianne Hackborn
58ce6f06a1 A few little tweaks to system ui flag demos.
Change-Id: Ib4c3b45e8d67200a2b4f3a8b0daee198b24bad0f
2012-05-18 19:43:57 -07:00
The Android Open Source Project
65e6090418 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I049767beb7309d00aca6793a9a67d5191c6c53bc
2012-05-18 18:42:01 -07:00
Xia Wang
08eafbb0cf am d699ad18: Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev
* commit 'd699ad187756b1138e6c697c285dd476c2d0c449':
  Remove the WaitEvent added in Tap and Drag.
2012-05-18 17:55:38 -07:00
Xia Wang
d699ad1877 Merge "Remove the WaitEvent added in Tap and Drag." into jb-dev 2012-05-18 17:52:58 -07:00
Xia Wang
5e20670c0b Remove the WaitEvent added in Tap and Drag.
As the delay is added as WaitEvent, throttle time is applied after
the WaitEvent. This cause problem for Tap and Drag. The thorrle time
is then inserted between ACTION_DOWN and ACTION_UP, or ACTION_DOWN
and ACTION_MOVE. This broke the two actions.

Change-Id: I5a122d6cb3d99e38d9442c3de50e0360652c4baf
2012-05-18 17:04:02 -07:00
Svetoslav Ganov
7947d9fb6a Updating the accessibility sample due to a security fix.
1. We have fixed a security issue in the framework and
   this patch is updating the sample.

Change-Id: Icc266ceaf0064cf8d9a00d7ad48746e1f0fbbbf1
2012-05-18 12:52:33 -07:00
The Android Automerger
2c57249f22 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-18 10:46:12 -07:00
The Android Automerger
8e8838df34 merge in jb-release history after reset to jb-dev 2012-05-17 07:00:16 -07:00
Andy Stadler
8eb23596b7 am 285ee4b3: Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev
* commit '285ee4b3b009d80683a5188b71ba125dd94e6cf7':
  Fix .classpath for eclipse.  DO NOT MERGE
2012-05-16 16:12:02 -07:00
Andy Stadler
285ee4b3b0 Merge "Fix .classpath for eclipse. DO NOT MERGE" into jb-dev 2012-05-16 16:02:33 -07:00
Andy Stadler
c26d4211cc Fix .classpath for eclipse. DO NOT MERGE
I've marked this do-not-merge because Email/Exchange are different
in master and this will probably break 'em.

Change-Id: I9f10bd41e143d7b9b6c784d503e79ec28e9f56c3
2012-05-16 15:58:26 -07:00
Jason Sams
edcc4754ee am dd1b1981: Merge "Put the compute samples back in the SDK." into jb-dev
* commit 'dd1b1981c33fad38567d4d1e2d56f5ac89ad8101':
  Put the compute samples back in the SDK.
2012-05-16 15:12:56 -07:00
Jason Sams
dd1b1981c3 Merge "Put the compute samples back in the SDK." into jb-dev 2012-05-16 15:08:11 -07:00
Jason Sams
8cb9623c6d Put the compute samples back in the SDK.
Change-Id: Idda5b632750e52eecf3a16205a0ff14af17b2e1b
2012-05-16 13:00:38 -07:00
Raphael Moll
30298a6c26 am 91ab8ff8: am 69ce67b4: Merge "Fix Mac SDK: sed s/--in-place/-i/"
* commit '91ab8ff8260e2dd27a3537fdbb20720c0391e2ce':
  Fix Mac SDK: sed s/--in-place/-i/
2012-05-16 09:14:27 -07:00