Alexander Lucas
2b7865c81d
am 6f4a084e: Merge "Added SIP Demo" into gingerbread
...
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
Added SIP Demo
2010-11-03 15:35:29 -07:00
Alexander Lucas
211a28eaae
Merge "Added SIP Demo" into gingerbread
2010-11-03 15:32:57 -07:00
Scott Main
4cb81c01b2
am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
...
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-03 15:18:10 -07:00
Justin Ho
82d5353f73
am 112b5b1f: Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
...
* commit '112b5b1f304846a1f6999a8347f45dae43719b8f':
DO NOT MERGE - Updated VPNServices stat_sys icons
2010-11-03 13:43:09 -07:00
Justin Ho
87933f223c
Merge "DO NOT MERGE - Updated VPNServices stat_sys icons" into gingerbread
2010-11-03 13:39:26 -07:00
Jeff Hamilton
ab29443cd4
am ef569469: Merge "Remove the My Tag feature." into gingerbread
...
* commit 'ef5694692f88bb91ed6ee1191b11a66ec594ff39':
Remove the My Tag feature.
2010-11-03 13:37:22 -07:00
Jeff Hamilton
8de195a531
Merge "Remove the My Tag feature." into gingerbread
2010-11-03 13:34:39 -07:00
Daniel Sandler
bceacf01a5
am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
...
* commit '65816a32ee2c2181895e3be636f3173a6e769f67':
Fix the fix for storage ANRs.
2010-11-03 12:38:40 -07:00
Daniel Sandler
9fd94b9d10
Merge "Fix the fix for storage ANRs." into gingerbread
2010-11-03 12:36:31 -07:00
James Dong
a2adbcb004
am f3847e87: Merge "DO NOT MERGE" into gingerbread
...
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
2010-11-03 09:25:08 -07:00
James Dong
15d9a6ddd8
Merge "DO NOT MERGE" into gingerbread
2010-11-03 09:21:44 -07:00
Dianne Hackborn
4397ab9989
am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
* commit '906b830d1d61cbd8b1f9c2dc87e564cfb0f315fd':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-02 22:28:10 -07:00
Daniel Sandler
3c2ad1b44b
am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
...
* commit 'cbc3219d2864a0b8d8ee6cda2c0b9a679bdeb200':
UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-02 20:35:17 -07:00
Daniel Sandler
49affef924
Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
2010-11-02 20:34:10 -07:00
Jason parks
02b8c9b3c9
am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit '73eba2a6bcf39eb20d815517ed11e1a7fb7a2c39':
Return a zero length byte from toByteArray instead of null.
2010-11-02 19:00:12 -07:00
Jason parks
e58a1272a8
Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
2010-11-02 18:58:09 -07:00
Dirk Dougherty
ea1ba55135
am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:47:20 -07:00
Dirk Dougherty
3f28855222
am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:43:54 -07:00
Dirk Dougherty
5eb239555c
Merge "Doc change: Update uses-feature and permissions docs." into froyo
2010-11-02 17:40:27 -07:00
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