Xia Wang
1df82adc5d
am a23fff33: (-s ours) am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
...
* commit 'a23fff33517ec4b117064dbc481862abfc55a4c2':
Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 16:27:17 -08:00
Scott Main
63cf252260
am 9e3d14c4: am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '9e3d14c4aad7e41406f633734973b191c21b5c5c':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 16:23:04 -08:00
Amith Yamasani
8ac37f19fa
Merge "Use newer SearchView icons and improve layout and highlights."
2010-11-24 16:20:00 -08:00
Mindy Pereira
9bf8ba893e
Merge "Per designers, update the algorithm for when effect is clipped or stretched."
2010-11-24 16:13:24 -08:00
Gloria Wang
4c87750afa
Merge "Remove empty Widevine make files"
2010-11-24 16:07:07 -08:00
Brad Fitzpatrick
2e3194eaed
Merge "Don't flash StrictMode from the system server."
2010-11-24 15:49:01 -08:00
Mindy Pereira
3a8855daf5
Merge "Use getDimensionPixel size instead of casting to an int."
2010-11-24 15:34:45 -08:00
Gilles Debunne
8968c11f05
Merge "Lazily create the paste popup window."
2010-11-24 14:49:04 -08:00
Gilles Debunne
7483a5040f
Merge "Assets moved from drawable to drawable-mdpi. hdpi created"
2010-11-24 14:43:40 -08:00
Adam Powell
f1a35185bf
Merge "Fix bug 3149106 - disabled text not dimmed"
2010-11-24 14:21:48 -08:00
Shyam Pallapothu
3aeb3f1db7
Merge "Added new bitrate values"
2010-11-24 14:14:28 -08:00
Xia Wang
eb536090ef
am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
...
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
Add Wi-Fi tests for static IP. DO NOT MERGE
2010-11-24 13:29:56 -08:00
Xia Wang
5cfbd426a4
Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread
2010-11-24 13:27:53 -08:00
Jaikumar Ganesh
5cce6f1cad
Merge "Fix some formatting issues."
2010-11-24 13:11:33 -08:00
Eric Laurent
0a7aa3e088
Merge "Fix issue 3225810."
2010-11-24 13:08:03 -08:00
Jaikumar Ganesh
9133bd06f2
Merge "Update BT code for voice capability cases."
2010-11-24 12:44:04 -08:00
Scott Main
57087147ef
am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:43:08 -08:00
Scott Main
03ffe08783
am 3577f51d: docs: clarify <include> layout properties bug: 3227820
...
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Jason Sams
5eaded435b
Merge "Fix physics bug causing balls to stack."
2010-11-24 12:13:40 -08:00
Wink Saville
8dc961f039
Merge "Promote ActiveApn and methods to DataConnectionTracker."
2010-11-24 11:37:53 -08:00
Joe Onorato
964f62726b
Merge "this should be @hidden"
2010-11-24 11:15:07 -08:00
Joe Onorato
062097c812
Merge "Align the battery & data icons correctly."
2010-11-24 11:15:01 -08:00
Andreas Huber
555d4af714
Merge "Support streaming data across binder boundaries."
2010-11-24 10:58:46 -08:00
Joe Onorato
4f5b008ff4
Merge "Allow status bar panels to be on top of the status bar."
2010-11-24 10:28:20 -08:00
Joe Onorato
ad1894d8df
Allow status bar panels to be on top of the status bar.
...
Change-Id: I3c74ece5f7042e6302717f4263746d59d5447ec9
2010-11-24 10:26:50 -08:00
Wink Saville
fc2265604a
Merge "Promote ApnSetting to com.android.internal.telephony."
2010-11-24 10:15:56 -08:00
Cary Clark
d092eb17ed
Merge "defer resume while selecting text"
2010-11-24 09:47:16 -08:00
Steve Block
4b270fd66a
Merge "Skip LayoutTest http/tests/cookies/third-party-cookie-relaxing.html"
2010-11-24 08:24:44 -08:00
Bjorn Bringert
6df7e03b3c
Merge "Don't drop zeros in the second position in formatDuration()"
2010-11-24 03:25:17 -08:00
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
