satok
f532358f66
Merge "Show ime switch icon when there is a hard keyboard" into honeycomb
2011-01-20 19:47:43 -08:00
Adam Cohen
15c7007c48
Merge "Cleaning up some StackView bad behavior" into honeycomb
2011-01-20 19:42:23 -08:00
Romain Guy
e86dbae3d5
Merge "Add support for drawBitmapMesh()." into honeycomb
2011-01-20 19:07:28 -08:00
Jim Miller
0b7e04fcee
Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb
2011-01-20 18:51:12 -08:00
Adam Powell
7f93197bc9
Merge "SearchView API Review - bug 3370353 and bug 3370338" into honeycomb
2011-01-20 18:44:32 -08:00
Stephen Hines
fb9ee8ce60
Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
2011-01-20 18:27:43 -08:00
Scott Main
65cd2ae7b8
Merge "docs: add getting started doc and version notes for HC preview" into honeycomb
2011-01-20 18:27:41 -08:00
Andreas Huber
819dd0b97d
Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
2011-01-20 17:05:48 -08:00
Scott Main
c7c4b14297
Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
2011-01-20 17:04:48 -08:00
Dianne Hackborn
2719a74d4c
Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
2011-01-20 16:57:34 -08:00
Brad Fitzpatrick
d24f1370ea
Merge "Fixes for StrictMode instance count checking." into honeycomb
2011-01-20 15:56:47 -08:00
Dianne Hackborn
1edf449d8f
Merge "Fix issue #3374356 : Buttons sometimes don't highlight" into honeycomb
2011-01-20 15:38:14 -08:00
Justin Ho
77e51d7636
Merge "Updated sysbar lights out assets and recents bg protect tile" into honeycomb
2011-01-20 15:27:06 -08:00
Adam Powell
7df16b6993
Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb
2011-01-20 14:39:56 -08:00
Daniel Sandler
7ed6baaf5a
Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb
2011-01-20 13:31:53 -08:00
Kenny Root
4f380fbc3f
Merge "Don't pay attention to string block on @null" into honeycomb
2011-01-20 13:27:35 -08:00
Trevor Johns
d47883f979
Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb
2011-01-20 13:19:25 -08:00
Joe Onorato
f14eb3ce68
Merge "Don't log the full stack trace when we can't load a resource." into honeycomb
2011-01-20 12:33:34 -08:00
Mathias Agopian
a9f54a77cd
Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb
2011-01-20 12:25:33 -08:00
Mathias Agopian
78efe9773e
Merge "clean-up unneeded code" into honeycomb
2011-01-20 12:25:26 -08:00
Stephen Hines
d9daf17fad
Merge "Remove unnecessary library functions." into honeycomb
2011-01-20 12:23:32 -08:00
Wink Saville
ce9e906c54
Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb
2011-01-20 12:20:59 -08:00
Mathias Agopian
2bd1d95efe
clean-up unneeded code
...
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
2011-01-20 12:10:11 -08:00
Daniel Sandler
c43534697c
Merge "Animate transitions between notification & settings panels." into honeycomb
2011-01-20 12:01:05 -08:00
Romain Guy
2949785dac
Merge "Remove unnecessary code." into honeycomb
2011-01-20 11:37:22 -08:00
Huahui Wu
da6bdadf64
Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
2011-01-20 11:08:33 -08:00
Svetoslav Ganov
b663e1e089
Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
2011-01-20 11:02:14 -08:00
Romain Guy
4a406b98a8
Merge "Documentation fix." into honeycomb
2011-01-20 10:57:59 -08:00
Eric Laurent
2baf7c380d
Merge "Fix issue 3371096." into honeycomb
2011-01-20 10:31:21 -08:00
Svetoslav Ganov
e57166443a
Merge "Some touches on the NumberPicker UI." into honeycomb
2011-01-20 10:08:39 -08:00
Gilles Debunne
1250b1c2f7
Merge "Error popup no longer flickers in TextViews." into honeycomb
2011-01-20 09:53:18 -08:00
James Dong
1f0b44988d
Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
2011-01-20 09:27:01 -08:00
Iain Merrick
1abf972acf
Merge "Add BrowserFrame.setCertificate() method." into honeycomb
2011-01-20 08:17:15 -08:00
Tadashi G. Takaoka
6d33446d70
Merge "Add android.provider.Settings.EXTRA_INPUT_METHOD_ID" into honeycomb
2011-01-20 07:30:36 -08:00
Kristian Monsen
9ba937c5e9
Merge "Clear the files we copy over to the temp cache" into honeycomb
2011-01-20 06:33:55 -08:00
Daniel Sandler
2c0188d214
Merge "Simplify and smooth notification panel animation." into honeycomb
2011-01-20 06:33:44 -08:00
Tadashi G. Takaoka
600833be5f
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
2011-01-20 05:17:51 -08:00
Chia-chi Yeh
b63e9d58bb
Merge "Update the path of the intent to unlock keystore." into honeycomb
2011-01-20 04:29:11 -08:00
Scott Main
2576fafa5a
Merge "Doc change: adding missing nfc demo png" into honeycomb
2011-01-19 22:58:08 -08:00
Hung-ying Tyan
a85f3a8316
Merge "Make VpnService synchronous API." into honeycomb
2011-01-19 22:41:20 -08:00
Scott Main
a5cb456b52
Merge "Doc change: adding missing samples" into honeycomb
2011-01-19 22:37:21 -08:00
Robert Ly
209cb4b809
Merge "Doc change: animation devguide topic" into honeycomb
2011-01-19 22:09:47 -08:00
Daniel Sandler
30de31bbac
Merge "Text & layout tweaks in system bar:" into honeycomb
2011-01-19 21:57:35 -08:00
Daniel Sandler
5a44cf4fb8
Merge "More fixes to ensure that touches outside the panel close it." into honeycomb
2011-01-19 21:57:26 -08:00
Romain Guy
51f3cad6e6
Merge "Add rounded rects and circles support to OpenGLRenderer." into honeycomb
2011-01-19 21:52:49 -08:00
Adam Powell
345c3b4beb
Merge "Better fix for bug 3112733" into honeycomb
2011-01-19 21:52:33 -08:00
Hung-ying Tyan
52261a55ef
Make VpnService synchronous API.
...
This eases VpnSettings on dealing with multiple-activity-instance problem
(i.e., SettingsActivity and VpnSettingsActivity).
+ Most of the code is moved from the VpnServices package to vpn/java/.
+ VpnManager and VpnServiceBinder are revised to provide synchronous API.
+ Add a new method isIdle() to IVpnService.aidl.
Related bug: 3293236 (need to deal with multiple-activity-instance problem)
Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
2011-01-20 12:51:43 +08:00
Jim Miller
c14915a2ce
Merge "Fix 3339257: Update lockscreen keyboard to fit Holo theme" into honeycomb
2011-01-19 20:15:49 -08:00
Jeff Brown
e3a983fe3e
Merge "Fix getSwitchState." into honeycomb
2011-01-19 18:54:11 -08:00
Jeff Brown
430c21ea87
Fix getSwitchState.
...
InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN
because SwitchInputMapper::getSources() returns 0 which cannot
match any source mask including AINPUT_SOURCE_ANY. As a result
initial lid switch detection is broken.
This change adds a new source constant AINPUT_SOURCE_SWITCH
that indicates that the source has switches.
Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
2011-01-19 18:41:38 -08:00
