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
Gloria Wang
5fc1dd15f5
Merge "Use SystemProperties.get() instead of System.getProperty()"
2010-11-02 17:26:24 -07:00
Romain Guy
e113710ebd
Merge "Optimize FBO drawing with regions. This optimization is currently disabled until Launcher is modified to take advantage of it. The optimization can be enabled by turning on RENDER_LAYERS_AS_REGIONS in the OpenGLRenderer.h file."
2010-11-02 16:23:22 -07:00
Romain Guy
b801624dc4
Optimize FBO drawing with regions.
...
This optimization is currently disabled until Launcher is
modified to take advantage of it. The optimization can be
enabled by turning on RENDER_LAYERS_AS_REGIONS in the
OpenGLRenderer.h file.
Change-Id: I2fdf59d0f4dc690a3d7f712173ab8db3848b27b1
2010-11-02 16:17:23 -07:00
Irfan Sheriff
0754fc6ec9
Merge "Use AsynChannel for synchronous API"
2010-11-02 16:12:13 -07:00
Gloria Wang
5d4f85bfce
Merge "Disable some logs"
2010-11-02 15:32:44 -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
Amith Yamasani
3c52e01ecc
Merge "Use Holo theme for Ringtone picker."
2010-11-02 14:37:59 -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
Stephen Hines
0dc3352c28
Merge "New RS types test for checking compilation."
2010-11-02 14:14:35 -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
Roy West
bd6a73630a
Merge "Fix bug 2248975, edits to load error HTML pages."
2010-11-02 13:54:30 -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
Kenny Root
3fa3666a2d
Merge "Fix default return code for getResource"
2010-11-02 11:40:27 -07:00
Kenny Root
ec033c57b6
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
71054a7c34
Merge "deperecate Cursor requery() and sa, Loader should be used instead"
2010-11-02 11:27:29 -07:00
Joe Onorato
8c6bd3d023
Merge "Put back the back button"
2010-11-02 10:11:25 -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
ba3328cd2a
Merge "Made paste window nicer: asset and padding"
2010-11-02 10:06:56 -07:00