Brad Fitzpatrick
ca59caeee2
Merge "Misc ActivityManagerNative cleanup."
2010-11-23 20:09:15 -08:00
satok
e8c824ff56
Merge "Add an API to set InputMethodAndSubtype"
2010-11-23 19:49:35 -08:00
Adam Powell
253b5d1434
Merge "Fix bug 3226108 - WebView would not update content properly after a fling."
2010-11-23 18:11:31 -08:00
Brad Fitzpatrick
ecb415ab8c
Merge "Misc Looper cleanups; add android.util.PrefixPrinter"
2010-11-23 17:59:53 -08:00
Vasu Nori
6528cfe035
Merge "changes to support Change-Id: I572fdfd6d34dbb5a0577c6cf14664b6f2d5700b4"
2010-11-23 17:52:19 -08:00
Fabrice Di Meglio
ea0ae5835a
Merge "Fix bug #2898737 (add unit tests for SyncOperation.toKey())"
2010-11-23 17:32:52 -08:00
Gilles Debunne
a6328003f7
Merge "Long press starts a new selection if one is already started."
2010-11-23 17:29:17 -08:00
Jeff Brown
8527bf6647
Merge "Fix build on Linux due to different strrchr prototype."
2010-11-23 16:32:54 -08:00
Joe Onorato
86c6210042
Merge "new signal strength assets"
2010-11-23 16:21:36 -08:00
Joe Onorato
485bf9a834
Merge "updated battery assets"
2010-11-23 16:21:29 -08:00
Joe Onorato
2dc35817c0
Merge "Turn off the long press on home action"
2010-11-23 16:21:22 -08:00
Mike Lockwood
37f9ea2660
Merge changes Ia5fec45a,I74927f73,I5a3c0b07
...
* changes:
MTP: Fix typo in MtpServer::doGetObjectPropList
MTP: Implement GetPartialObject command
MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
2010-11-23 16:11:29 -08:00
Chet Haase
8fee7e8177
Merge "Fix hang in native bitmap recycling due to nested mutex locks"
2010-11-23 16:01:49 -08:00
Jeff Brown
44a2a171e1
Merge "Port Emulator keymaps."
2010-11-23 15:51:27 -08:00
Mindy Pereira
d42da83f56
Merge "Create logic for applying padding only to custom preference layouts"
2010-11-23 15:34:27 -08:00
Jeff Brown
d5fdf7d74b
Port Emulator keymaps.
...
Also added a validation tool for keymaps (not currently integrated
into the build system but getting there).
This change brings back Android.mk with the intent that it will
be used to validate keymaps in a later change.
Added some missing keys that are present on phones.
Bug: 3215210
Bug: 3225421
Change-Id: Id817c6e2215164616942c51a42752915d9ceacd3
2010-11-23 15:26:48 -08:00
Brad Fitzpatrick
ae53f9ecdb
Merge "StrictMode.Span annotations for ScrollView."
2010-11-23 14:15:00 -08:00
Irfan Sheriff
543e3f735d
Merge "Stop listening to supplicant state change events"
2010-11-23 13:43:06 -08:00
Xavier Ducrohet
71d9da548c
Merge "Layoutlib: use default nine patch classes."
2010-11-23 13:38:21 -08:00
James Dong
14e1017e6f
Merge "Do not getConfig on video encoder on output port"
2010-11-23 13:38:18 -08:00
satok
3664697487
Merge "Change return type of getShortcutInputMethodsAndSubtypes to Map<InputMethodInfo, List<InputMethodSubtype>>"
2010-11-23 13:34:04 -08:00
Irfan Sheriff
628d53f0df
Merge "Fix Wifi's setting of isAvailable."
2010-11-23 13:27:56 -08:00
Mindy Pereira
b5f1df9a02
Merge "Update edge and glow rendering to match new specs."
2010-11-23 11:32:51 -08:00
Brad Fitzpatrick
a1ff017aec
Merge "StrictMode fingerprinting / hashCode improvements."
2010-11-23 11:19:53 -08:00
Jean-Baptiste Queru
ffb0795daf
am 9df7f313: am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
...
* commit '9df7f31359866a77a47c9fab3171c71715fd0056':
frameworks/base: Destroy the overlay even if there is an error
2010-11-23 11:17:48 -08:00
Jean-Baptiste Queru
ec756056ab
am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
...
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
4e8fa27b4e
Merge "frameworks/base: Destroy the overlay even if there is an error"
2010-11-23 11:02:09 -08:00
Huahui Wu
fe67926ecd
Merge "b/3186860: fix failing layout tests: fast/events/touch/basic-multi-touch-events-limited.html fast/events/touch/touch-target-limited.html"
2010-11-23 10:56:54 -08:00
Brad Fitzpatrick
c3fe27e399
Merge "Cache WindowManager in StrictMode; add android.util.Singleton"
2010-11-23 10:41:07 -08:00
Cary Clark
4adde74e65
Merge "cancel text selection on rotate"
2010-11-23 10:14:55 -08:00
Brad Fitzpatrick
26674e7885
Merge "CloseGuard cleanups."
2010-11-23 10:14:29 -08:00
Adam Powell
4993594173
Merge "Merge overscrolling from gingerbread."
2010-11-23 10:06:10 -08:00
Vasu Nori
4eca9e0ef7
Merge "print certain rows from downloads.db when bugreports are taken"
2010-11-23 10:05:06 -08:00
Mike Lockwood
15170ed4c7
Merge "MTP: Remove static library build for linux host."
2010-11-23 09:22:37 -08:00
Kenny Root
6cc78e2c3d
Merge "Add knowledge of mipmap to aapt"
2010-11-23 09:20:33 -08:00
Gloria Wang
751199390b
am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:29:22 -08:00
Gloria Wang
cf20042f80
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
...
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
2010-11-22 21:29:08 -08:00
Gloria Wang
8cec955963
am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
...
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
2010-11-22 21:26:13 -08:00
Gloria Wang
81ee631fd5
am d9334934: Merge "Update of DRM Framework."
...
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
2010-11-22 21:25:56 -08:00
Gloria Wang
6772c2d92d
Merge "Notify the playback status to DRM agents before the playback starts"
2010-11-22 21:15:07 -08:00
Gloria Wang
80b7966f1f
Merge "Update of DRM Framework."
2010-11-22 21:14:09 -08:00
Dianne Hackborn
35d64df51b
Merge "New animations from lbk."
2010-11-22 21:05:39 -08:00
satok
9250194b2e
Merge "Add an API to get shortcut IMEs"
2010-11-22 17:27:43 -08:00
Jean-Baptiste Queru
f2854d02e3
Merge "resolved conflicts for merge of 8484e57f to master"
2010-11-22 16:46:18 -08:00
Jean-Baptiste Queru
dec491cf02
resolved conflicts for merge of 8484e57f to master
...
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
2010-11-22 16:43:59 -08:00
Gil Dobjanschi
bfba13c13b
Merge "Begin transition was invalidated when the image duration was changed."
2010-11-22 16:38:38 -08:00
Jean-Baptiste Queru
37e7e9e052
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
...
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Joe Onorato
c8f77827db
Merge "Add a better notification test and clean up the flag handling in the notification builder."
2010-11-22 16:28:32 -08:00
Jason Sams
bc07b41d83
Merge "More error checks"
2010-11-22 16:27:59 -08:00
Justin Ho
bfda58f54e
Merge "Merging some Gingerbread status bar icons to master"
2010-11-22 16:24:48 -08:00
