Andreas Huber
7ccd10dde8
Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
2010-11-03 14:40:27 -07:00
Shimeng (Simon) Wang
527970679d
Merge "Prevent 0 content width."
2010-11-03 14:33:28 -07:00
Jason Sams
44254951ea
Merge "RS Error cleanup. Thow java exception during init if the GL driver fails rather than native crash."
2010-11-03 14:29:16 -07:00
Bryan Mawhinney
ec8d299a0b
Merge "Avoid copying byte arrays when just decoding bounds."
2010-11-03 14:05:54 -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
Xavier Ducrohet
080c4462f7
Merge "Layoutlib native delegate: primitive shapes and shaders"
2010-11-03 13:30:22 -07:00
Xavier Ducrohet
ccaa0bf614
Merge "More layout Canvas/Paint implementation."
2010-11-03 13:30:17 -07:00
Daniel Sandler
53bf8dfb5e
am 9f4f20c2: am 65816a32: Merge "Fix the fix for storage ANRs." into gingerbread
...
* commit '9f4f20c2451325850cb81e886f1e76155e7e098d':
Fix the fix for storage ANRs.
2010-11-03 12:42:35 -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
Irfan Sheriff
7259b1cad8
Merge "Set country code in the driver and remove channel set"
2010-11-03 12:23:01 -07:00
Gilles Debunne
3251974cda
Merge "Tapping in a empty textEdit shows the handle."
2010-11-03 12:21:16 -07:00
Ben Komalo
b8b9851beb
Merge "Fix issue where home layout click listener was being attached before it was initialized."
2010-11-03 12:18:40 -07:00
Adam Powell
9bd875503f
Merge "Make Theme.Holo.Dialog.Alert and Theme.Holo.Light.Dialog.Alert public"
2010-11-03 12:06:44 -07:00
James Dong
ae61ee66dc
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread
...
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
DO NOT MERGE
2010-11-03 12:02:53 -07:00
Chris Tate
76640971d1
Merge "Fix drag enter/exit reporting"
2010-11-03 12:00:56 -07:00
Dianne Hackborn
787adb0877
am 0ce0f72c: am 906b830d: Revert "UMS: Avoid SystemUI ANRs during long vold operations."
...
* commit '0ce0f72c1eb92cf654667c15477f19b4a7e84cd1':
Revert "UMS: Avoid SystemUI ANRs during long vold operations."
2010-11-03 11:43:16 -07:00
Daniel Sandler
0698f89d36
am 1df8765a: am cbc3219d: Merge "UMS: Avoid SystemUI ANRs during long vold operations." into gingerbread
...
* commit '1df8765ac05ed83c212e899fa6c74a6cc012e7b0':
UMS: Avoid SystemUI ANRs during long vold operations.
2010-11-03 11:43:03 -07:00
Jason parks
babf2cbbc7
am bcbf17a5: am 73eba2a6: Merge "Return a zero length byte from toByteArray instead of null." into gingerbread
...
* commit 'bcbf17a5823380b59ad5617c79c1f14d365bdc23':
Return a zero length byte from toByteArray instead of null.
2010-11-03 11:42:40 -07:00
Dirk Dougherty
f719b6e8af
am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '243a28ba2d58acea96a33cd6c73cb805a653863f':
Doc change: Update uses-feature and permissions docs.
2010-11-03 11:42:31 -07:00
Brad Fitzpatrick
fd768c8350
am f3a6b901: am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"
...
* commit 'f3a6b901917b1609c6f1901bb36deb07a58fd20d':
NotificationManager: droiddoc documentation improvements
2010-11-03 11:42:19 -07:00
Gloria Wang
04b9169434
resolved conflicts for merge of a8d7b747 to master
...
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
2010-11-03 11:39:04 -07:00
Nick Pelly
df80eba3cd
am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread
...
* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
Remove timeout support.
2010-11-03 10:59:54 -07:00
Jean-Baptiste Queru
dc09cf4a33
am c91e4673: am bbd212d7: Merge "Document per-implementation behaviors of native get* methods"
...
* commit 'c91e46730d14611fb85cd7b2d3e51dac5ce538a2':
Document per-implementation behaviors of native get* methods
2010-11-03 10:59:44 -07:00
Jean-Baptiste Queru
2729347c6d
am 0b5d57ab: am 715f8610: Merge "Clarify documentation of Cursor get* methods."
...
* commit '0b5d57ab7ea062af4502be5af2d51883d251c0bc':
Clarify documentation of Cursor get* methods.
2010-11-03 10:59:36 -07:00
Gloria Wang
fb7b3918e1
am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
...
* commit 'cf393faaa871333496a63c13196fdbc0f2bd9118':
- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled.
2010-11-03 10:59:23 -07:00
Joe Malin
3f1072eb34
am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
...
* commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-03 10:59:03 -07:00
Raphael
d325165d7c
am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
...
* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
Support for <compatible-screens><screen> in ADT.
2010-11-03 10:58:47 -07:00
Gilles Debunne
5f3db64914
am a090d64a: (-s ours) am 18149c47: Merge "Rescaled/updated mdpi assets added." into gingerbread
...
* commit 'a090d64ac198b878a3ea01204298d5ed5eb8fbb8':
Rescaled/updated mdpi assets added.
2010-11-03 10:58:09 -07:00
Gilles Debunne
3180d34a1a
am 51b9cc04: (-s ours) am 94da7f98: Merge "Rescaled/updated mdpi assets added." into gingerbread
...
* commit '51b9cc04e816a2bd613ad624b3ed7c6f12381928':
Rescaled/updated mdpi assets added.
2010-11-03 10:50:29 -07:00
Jean-Baptiste Queru
5f3c2b79fa
Merge "Fix the animation disappeared issue"
2010-11-03 10:16:30 -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
Gil Dobjanschi
9b8279e176
Merge "Use SoftReference for WaveformData"
2010-11-02 20:26:22 -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
Xavier Ducrohet
411fa52829
Merge "More implementation of the layoutlib Paint/Canvas delegates."
2010-11-02 18:28:16 -07:00
Jeff Brown
3a1cbeeb9a
Merge "Fix a key repeating bug."
2010-11-02 18:23:55 -07:00
Jeff Brown
92988aab48
Fix a key repeating bug.
...
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.
Bug: 3159581
Change-Id: If0f02662313f5b879a4e566fbb461389e274a550
2010-11-02 17:58:22 -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
Jeff Brown
b0bb949f09
Merge "Add plumbing for volume mute key."
2010-11-02 17:38:18 -07:00
Jeff Brown
7e5660f3e2
Add plumbing for volume mute key.
...
Full support for the volume mute key will be implemented in a
later change.
Bug: 2912307
Change-Id: I98c27d6360f159c8b7447e04b45f442eff87b38a
2010-11-02 17:31:39 -07:00