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
Dave Sparks
4cec2c81f4
Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
2011-01-19 19:23:32 -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
Alexander Lucas
42fcecd80f
Merge "Added Honeycomb-Gallery to docs." into honeycomb
2011-01-19 18:33:43 -08:00
Mathias Agopian
4f808ae6ba
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into honeycomb
2011-01-19 18:22:45 -08:00
Mathias Agopian
c71c70a16a
Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into honeycomb
2011-01-19 18:22:35 -08:00
Mathias Agopian
d5ea3db6a3
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
...
EGLUtils::selectConfigForPixelFormat() now uses EGL_NATIVE_VISUAL_ID
to select a config with the proper format. this is more robust and
future proof.
Change-Id: I7245d904adab1e339f062b9b498ddd9324cfe7a4
2011-01-19 18:21:15 -08:00
Huahui Wu
219e52a85b
Merge "b/3350774 avoid screen jumping when pinching to zoom." into honeycomb
2011-01-19 18:16:24 -08:00
Irfan Sheriff
780e8aa44f
Merge "Handle EAP authentication failure" into honeycomb
2011-01-19 17:58:19 -08:00
Jeff Brown
bd58ce731f
Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
2011-01-19 17:56:32 -08:00
Jason Sams
13530a1888
Merge "Remove some old logging code." into honeycomb
2011-01-19 17:50:15 -08:00
Mathias Agopian
3357c05996
Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
2011-01-19 17:32:21 -08:00
Christopher Tate
f8538c4517
Merge "Make the drag input window fullscreen touchable again" into honeycomb
2011-01-19 17:29:14 -08:00
Stephen Hines
b34b8bb6c5
Merge "Clean up RS math fp library functions." into honeycomb
2011-01-19 17:24:53 -08:00
Daniel Sandler
8fe0323fe9
Merge "Notification & settings panel redesign." into honeycomb
2011-01-19 17:24:42 -08:00
Adam Powell
0b181742aa
Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb
2011-01-19 17:11:37 -08:00
Jeff Brown
6c4b44558d
Merge "Never drag scroll views with no children." into honeycomb
2011-01-19 17:03:08 -08:00
Jeff Brown
e9089f6994
Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
2011-01-19 17:03:03 -08:00
Mathias Agopian
d927e3b013
Merge "fix [3367893] Rotating device on YouTube's home screen several times kills system_server" into honeycomb
2011-01-19 17:01:22 -08:00
Romain Guy
1fb583d9fe
Merge "Fix toasts." into honeycomb
2011-01-19 16:51:44 -08:00
Jason Sams
c5fcd0c5cf
Merge "Check and propogate errors from llvm." into honeycomb
2011-01-19 16:49:17 -08:00
Christopher Tate
1388174332
Merge "Fail more gracefully when window state changes during drags" into honeycomb
2011-01-19 16:41:14 -08:00
Amith Yamasani
0615d2be4c
Merge "Ensure that the column is valid before querying." into honeycomb
2011-01-19 16:40:14 -08:00
Mathias Agopian
6918b0b9b3
Merge "improve SurfaceFlinger 'dumpsys' log" into honeycomb
2011-01-19 16:31:32 -08:00
Dianne Hackborn
800da1b433
Merge "Hook up large heap API." into honeycomb
2011-01-19 16:28:31 -08:00
Jason Sams
59cc7fda69
Merge "Expose unchecked copyFrom variants." into honeycomb
2011-01-19 16:27:06 -08:00
Mathias Agopian
48b888aab9
improve SurfaceFlinger 'dumpsys' log
...
list the purgatory, which shows windows that have been closed,
but for which the client still has references.
Change-Id: I5168bb88cb328d5d77d71d0871deb9190f493126
2011-01-19 16:15:53 -08:00
Joe Onorato
78c4d25186
Merge "Cut a hole in the status bar for events when the IME is open." into honeycomb
2011-01-19 16:14:14 -08:00
Joe Onorato
ee0e0aa8d7
Merge changes I3814b491,Ic3a7f4c0 into honeycomb
...
* changes:
Pass SkRegion::toString() through to java.
Remove optimization to isInContentArea that wasn't working.
2011-01-19 16:11:04 -08:00
Mike Lockwood
d1fa69d3d1
Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb
2011-01-19 16:09:49 -08:00
Gilles Debunne
525443a372
Merge "Race condition patched in Email autocompletion." into honeycomb
2011-01-19 16:08:20 -08:00
Gloria Wang
ff06a6ca66
Merge "More fix for 64 bit offset." into honeycomb
2011-01-19 15:57:23 -08:00