Brad Fitzpatrick
55475ca712
am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
...
* commit '9df48a0305818122298a86ae9949f6688814928b':
NotificationManager: droiddoc documentation improvements
2010-11-02 15:00:06 -07:00
Gloria Wang
3c7c44aae0
am ef8a810b: Merge "Update of DRM framework"
...
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
Update of DRM framework
2010-11-02 14:59:51 -07:00
Brad Fitzpatrick
0d4ee6683b
Merge "NotificationManager: droiddoc documentation improvements"
2010-11-02 14:55:21 -07:00
Nick Pelly
c5d080fe89
am 38e561dd: Merge "Remove timeout support." into gingerbread
...
* commit '38e561dd3cd72160035d8b3002fc9bbaf3071374':
Remove timeout support.
2010-11-02 14:49:35 -07:00
Nick Pelly
967c143f91
Merge "Remove timeout support." into gingerbread
2010-11-02 14:46:46 -07:00
Gloria Wang
b8563353d5
Merge "Update of DRM framework"
2010-11-02 14:45:02 -07:00
Jean-Baptiste Queru
55d75a9532
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
84b0164224
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
Gloria Wang
9bc44ea84f
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
49bcf3e8b6
resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
...
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
2010-11-02 14:02:59 -07:00
Jean-Baptiste Queru
d1089d117e
Merge "Document per-implementation behaviors of native get* methods"
2010-11-02 13:27:36 -07:00
Joe Malin
dc6805745f
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
65b842595d
Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
2010-11-02 13:17:16 -07:00
Jean-Baptiste Queru
b664bdce42
Merge "Clarify documentation of Cursor get* methods."
2010-11-02 13:11:56 -07:00
Raphael
8acbc9d954
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
1dfaaa7368
Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
2010-11-02 11:43:11 -07:00
Gilles Debunne
3166db0994
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
27d7d3eda1
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
b14d942ae5
Merge "Rescaled/updated mdpi assets added." into gingerbread
2010-11-02 10:05:52 -07:00
Gilles Debunne
3c65ce2dc3
Merge "Rescaled/updated mdpi assets added." into gingerbread
2010-11-02 10:04:40 -07:00
Jeff Brown
5d0a9b474b
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
Jeff Brown
f6149c3229
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
1e04f5b26c
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
Neal Nguyen
fbadab9066
am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
...
* commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
Adding some StorageManager integration test infrastructure and some basic tests.
2010-11-01 19:42:22 -07:00
Neal Nguyen
815a6bc0cf
am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
...
* commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64':
Cleaning up some more flakiness in DownloadManager tests.
2010-11-01 17:41:24 -07:00
Joe Malin
d9f82fa280
am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
...
* commit 'a7fda21c8298d8f316564280d702206147207005':
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:30:59 -07:00
Dan Bornstein
4c5bcb1892
am ccb75a88: Merge "Update the API file." into gingerbread
...
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
Update the API file.
2010-11-01 16:09:44 -07:00
Dan Bornstein
6a91efdb87
Merge "Update the API file." into gingerbread
2010-11-01 16:08:14 -07:00
Scott Main
10c5f8f100
am fea07c60: am eda78cea: docs: update dashboard
...
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
docs: update dashboard
2010-11-01 16:00:43 -07:00
Scott Main
663217c6d0
am eda78cea: docs: update dashboard
...
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
docs: update dashboard
2010-11-01 15:57:38 -07:00
Leon Scroggins
a61c53dfe5
am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
...
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Leon Scroggins
fd2ddb4c43
Merge "Update insertion handler for WebTextView." into gingerbread
2010-11-01 14:49:47 -07:00
Jean-Baptiste Queru
39fc718490
am 5b4d0e84: Merge "TabWidget orientation"
...
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
TabWidget orientation
2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
86b2b99f9d
Merge "TabWidget orientation"
2010-11-01 13:19:02 -07:00
Dianne Hackborn
cc3af429d8
am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:49:51 -07:00
Dianne Hackborn
2ee26e2cf4
Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
2010-11-01 12:47:02 -07:00
Jean-Baptiste Queru
4188d55474
am b6db2d51: Merge "Bluetooth OBEX timeout problem."
...
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
Bluetooth OBEX timeout problem.
2010-11-01 10:53:09 -07:00
Jean-Baptiste Queru
d37761cfd9
Merge "Bluetooth OBEX timeout problem."
2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
1cf05e8506
am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database ( http://code.google.com/p/android/issues/detail?id=7907 )."
...
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907 ).
2010-11-01 10:39:01 -07:00
Jean-Baptiste Queru
24574f1312
Merge "Fixes Issue 7907 in the public bugs database ( http://code.google.com/p/android/issues/detail?id=7907 )."
2010-11-01 10:29:22 -07:00
Romain Guy
bcd52db16e
am cee8d1d3: Merge "fix typo"
...
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
fix typo
2010-10-31 11:21:24 -07:00
Romain Guy
a290bb6aba
Merge "fix typo"
2010-10-31 11:12:51 -07:00
Dianne Hackborn
35cd3521e2
am 70a2c15e: Final SDK API 9. DO NOT MERGE.
...
* commit '70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
2010-10-29 19:03:03 -07:00
Scott Main
d0af840115
am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit '38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
2010-10-29 17:21:07 -07:00
Scott Main
33f2f39576
am 579db096: docs: remove another "new" tag
...
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
2010-10-29 17:16:57 -07:00
Neal Nguyen
8154016625
am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
...
* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
A little tweaking of DL Manager tests and adding better debugging output.
2010-10-29 17:10:12 -07:00
Neal Nguyen
e24b6ae868
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
2010-10-29 17:07:59 -07:00
Scott Main
2ebd346aa4
am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:37:17 -07:00
Scott Main
53c33985c6
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
2010-10-29 15:34:00 -07:00
Leon Clarke
3f14260637
am 5ccbe059: DO NOT MERGE. Add assets for <select>
...
* commit '5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
2010-10-29 14:49:07 -07:00