35504 Commits

Author SHA1 Message Date
Irfan Sheriff
acc863cabb Merge "Use AsynChannel for synchronous API" 2010-11-02 16:12:13 -07:00
Irfan Sheriff
1406bcb751 Use AsynChannel for synchronous API
also cleaned up some unnecessary synchronous commands from state machine,
and fixed an issue with a synchronous WPS command

Change-Id: I55bf4379d9810e11f2ba2e03e2e703b132d1488f
2010-11-02 16:08:35 -07:00
Chris Tate
9d1ab88329 Fix drag enter/exit reporting
Now, each ViewGroup is tracking which of its child views [which might
themselves be ViewGroups] is currently under the drag point, and when the
drag leaves that child, a DRAG_EXITED is synthesized and dispatched all
the way down to the leaf view previously under the point.  ENTERED is
still *not* dispatched down like this; instead, it's calculated and
synthesized directly at each level based on the new LOCATION.

The ViewRoot still tracks the leaf drag target, but solely for the
purpose of reporting changes to the OS after full dispatch of a new
LOCATION -- the entered/exited messaging is no longer initiated at the
ViewRoot level.

Change-Id: I0089cc538b7e33a0440187543fcfd2f8b12e197d
2010-11-02 15:55:39 -07:00
Gloria Wang
c68134b740 Merge "Disable some logs" 2010-11-02 15:32:44 -07:00
Gloria Wang
1b42e92dec Disable some logs
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
2010-11-02 15:09:43 -07:00
Brad Fitzpatrick
f3a6b90191 am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
* commit '9df48a0305818122298a86ae9949f6688814928b':
  NotificationManager: droiddoc documentation improvements
2010-11-02 15:00:06 -07:00
Gloria Wang
a8d7b7477d am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
  Update of DRM framework
2010-11-02 14:59:51 -07:00
Brad Fitzpatrick
9df48a0305 Merge "NotificationManager: droiddoc documentation improvements" 2010-11-02 14:55:21 -07:00
Nick Pelly
6fb9316f6b am 38e561dd: Merge "Remove timeout support." into gingerbread
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
  Remove timeout support.
2010-11-02 14:49:35 -07:00
Nick Pelly
38e561dd3c Merge "Remove timeout support." into gingerbread 2010-11-02 14:46:46 -07:00
Gloria Wang
ef8a810b3b Merge "Update of DRM framework" 2010-11-02 14:45:02 -07:00
Amith Yamasani
0a1adf9012 Merge "Use Holo theme for Ringtone picker." 2010-11-02 14:37:59 -07:00
Jean-Baptiste Queru
c91e46730d am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
* commit 'bbd212d77852be155a815a0d2ad1da0df2c0dfe1':
  Document per-implementation behaviors of native get* methods
2010-11-02 14:18:07 -07:00
Jean-Baptiste Queru
0b5d57ab7e am 715f8610: Merge "Clarify documentation of Cursor get* methods."
* commit '715f86107763ee95e7d6558dd8da390a63da63e2':
  Clarify documentation of Cursor get* methods.
2010-11-02 14:18:02 -07:00
Stephen Hines
611f56721f Merge "New RS types test for checking compilation." 2010-11-02 14:14:35 -07:00
Nick Pelly
275708c82c Remove timeout support.
The implementation was guarenteed to cause deadlock when a timeout was set.

Change-Id: I59444ea784eb9057c6c4c9e9123f558b3ef5eef6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-11-02 16:13:52 -05:00
Gloria Wang
cf393faaa8 Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-11-02 14:05:13 -07:00
Gloria Wang
35a4f21bd6 resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
2010-11-02 14:02:59 -07:00
Amith Yamasani
482c933297 Use Holo theme for Ringtone picker.
Bug: 3148863
2010-11-02 14:02:32 -07:00
Stephen Hines
ce13d94ccb New RS types test for checking compilation.
Change-Id: Ib4d0326462d4d0229430f61c74f16979f7b38dbb
2010-11-02 13:58:12 -07:00
Roy West
b4d9c66c9e Merge "Fix bug 2248975, edits to load error HTML pages." 2010-11-02 13:54:30 -07:00
Marco Nelissen
e4eb4d9de3 In java, System.getProperty returns null when the property doesn't exist,
rather than an empty string like it does in native code.
b/3157546

Change-Id: I7985a405e4d2d1f20be0a151aa2cf2e5a83b380b
2010-11-02 13:47:20 -07:00
Roy West
f1c5138592 Fix bug 2248975, edits to load error HTML pages.
Change-Id: I17e98926ef3b0d792bb85200847d649425b9aeb5
2010-11-02 13:42:19 -07:00
Jean-Baptiste Queru
bbd212d778 Merge "Document per-implementation behaviors of native get* methods" 2010-11-02 13:27:36 -07:00
Joe Malin
fcea62a64c am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
* commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
  DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-02 13:18:47 -07:00
Joe Malin
c1fad4a2e3 Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread 2010-11-02 13:17:16 -07:00
Jean-Baptiste Queru
715f861077 Merge "Clarify documentation of Cursor get* methods." 2010-11-02 13:11:56 -07:00
Vasu Nori
4b8d36b30a fix broken build
Change-Id: I6fb1996932a75199fa42f43367c9ed266d3ba85c
2010-11-02 12:12:39 -07:00
Raphael
19ed73ae7f am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '46468dde8d7f9bd42ad180c2882bff6ef98685cd':
  Support for <compatible-screens><screen> in ADT.
2010-11-02 11:45:07 -07:00
Raphael
46468dde8d Merge "Support for <compatible-screens><screen> in ADT." into gingerbread 2010-11-02 11:43:11 -07:00
Kenny Root
70347c26e1 Merge "Fix default return code for getResource" 2010-11-02 11:40:27 -07:00
Kenny Root
5c4cf8cd7c Fix default return code for getResource
Reorganization of getResource to allow for other densities accidentally
overrode the default return code for getResource from BAD_VALUE to
BAD_INDEX. This corrects the default return to BAD_VALUE which restores
other things to working.

Bug: 3155824
Change-Id: I13dafff85bc6978c5f5435fc09ab0474c7885c4d
2010-11-02 11:27:31 -07:00
Vasu Nori
cd07204250 Merge "deperecate Cursor requery() and sa, Loader should be used instead" 2010-11-02 11:27:29 -07:00
Vasu Nori
820e9b6b9c deperecate Cursor requery() and sa, Loader should be used instead
the warning printed currently "do requery on background thread"
is not that useful in processes such as gapps, acore.
to reduce the deluge of bugs assigned to me, I think a simple
deprecation warning is better.

Change-Id: I7a1129ea889f10e72895092a3cdd48cc96d0d1f0
2010-11-02 11:14:38 -07:00
Joe Onorato
460119b7ea Merge "Put back the back button" 2010-11-02 10:11:25 -07:00
Gilles Debunne
a090d64ac1 am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '18149c47bfc87c88798e6820d7153e588b374ed3':
  Rescaled/updated mdpi assets added.
2010-11-02 10:08:27 -07:00
Gilles Debunne
1c57ffb9e4 Merge "Made paste window nicer: asset and padding" 2010-11-02 10:06:56 -07:00
Gilles Debunne
51b9cc04e8 am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
* commit '94da7f983cc33d10bf1560bb32ec19400437a42a':
  Rescaled/updated mdpi assets added.
2010-11-02 10:05:55 -07:00
Gilles Debunne
18149c47bf Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:05:52 -07:00
Gilles Debunne
94da7f983c Merge "Rescaled/updated mdpi assets added." into gingerbread 2010-11-02 10:04:40 -07:00
Daniel Trebbien
adf4194458 Document per-implementation behaviors of native get* methods
Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
2010-11-02 09:35:12 -07:00
Daniel Trebbien
65068b099e Clarify documentation of Cursor get* methods.
Make clear in the Javadoc comments of the `Cursor` get* methods that
implementations thereof can have implementation-defined behavior. In some cases,
these changes actually correct the documentation. For example, in the case of
`getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is
*not* converted to a `short` via Short#valueOf or even in a functionally-
equivalent manner.

Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
2010-11-02 09:24:07 -07:00
satok
7e63e4df10 Merge "Update the subtype icon properly." 2010-11-02 04:14:17 -07:00
satok
06e0744e9e Update the subtype icon properly.
Change-Id: Ib89959d1ea13f1e6f56e6280f90532e6695c4a00
2010-11-02 20:11:28 +09:00
Jeff Brown
c4b5bf3c76 am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f':
  Fix bugs related to cheek event suppression.
2010-11-02 02:34:15 -07:00
Joe Onorato
7e750b1b84 Put back the back button
Change-Id: I0aea487eb2123d3d7e689c2f8ef24e9025a34aee
2010-11-02 00:14:33 -07:00
Jeff Brown
7ab5d2d951 am a87ea46c: Fix bugs related to cheek event suppression.
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d':
  Fix bugs related to cheek event suppression.
2010-11-01 21:02:05 -07:00
Adam Cohen
a32edd4b4c Adding click feedback to widget collections
Change-Id: I97fceb6c68ca6eb1b703eafacf201e1aed7c38e7
2010-11-01 20:53:38 -07:00
Jeff Brown
a87ea46cb0 Fix bugs related to cheek event suppression.
Two issues:

1. First, due to an inverted conditional in the input dispatcher, we were
   reporting touches as long touches and vice-versa to the power manager.

2. Power manager user activity cheek event suppression also suppresses touch
   events (but not long touch or up events).  As a result, if cheek event
   suppression was enabled, touches would not poke the user activity timer.
   However due to the above logic inversion, this actually affected long
   touches.  Net result, if cheek suppression was enabled in the power manager
   and you held your thumb on the screen long enough, the phone would
   go to sleep!

Cheek event suppression is commonly turned on when making a phone call.
Interestingly, it does not seem to get turned off afterward...

This change fixes the logic inversion and exempts touches from the cheek
suppression.  The reason we do the latter is because the old behavior
was actually harmful in other ways too: a touch down would be suppressed
but not a long touch or the touch up.  This would cause bizarre behavior
if you touched the screen while it was dimmed.  Instead of brightening
immediately, it would brighten either when you lifted your finger or
300ms later, whichever came first.

Bug: 3154895
Change-Id: Ied9ccec6718fbe86506322ff47a4e3eb58f81834
2010-11-01 20:51:58 -07:00
Gloria Wang
c1c45a4dc9 Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled." 2010-11-01 20:38:51 -07:00