Svetoslav Ganov
309b18e791
Merge "Adding accessibility support to the PIN lock screen."
2011-08-17 04:31:37 -07:00
Kristian Monsen
deed89a8d5
Merge "Fix for bug 3429537 Google voice (web version) does not play messages on HC"
2011-08-17 02:41:39 -07:00
Kristian Monsen
bd151dee64
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
2011-08-17 02:41:00 -07:00
Ben Murdoch
f1142b051b
Merge "No need to pass an AssetManager to native when creating a WebView"
2011-08-17 02:28:52 -07:00
Dianne Hackborn
e518be3085
am 51beb81a: am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit '51beb81a8e901020293b7a30a68b405bca71d258':
Handle stopping of services with still bound applications.
2011-08-16 20:47:39 -07:00
Dianne Hackborn
51beb81a8e
am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
Handle stopping of services with still bound applications.
2011-08-16 20:45:19 -07:00
Dianne Hackborn
ee93fd5c0d
am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
Handle stopping of services with still bound applications.
2011-08-16 20:42:17 -07:00
Dianne Hackborn
7a0d746bf2
am baaf3ce6: Merge "Handle stopping of services with still bound applications."
...
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
Handle stopping of services with still bound applications.
2011-08-16 20:39:50 -07:00
Dianne Hackborn
baaf3ce638
Merge "Handle stopping of services with still bound applications."
2011-08-16 19:29:25 -07:00
James Dong
c5f9a42c50
Merge "Use camcorder profiles for MediaRecorderStressTest"
2011-08-16 18:26:54 -07:00
Scott Main
dfd94b460e
Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542"
2011-08-16 18:26:34 -07:00
Fabrice Di Meglio
c5f7a851b3
Merge "Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic"
2011-08-16 17:35:06 -07:00
Fabrice Di Meglio
5960723061
Fix bug #5174495 Harfbuzz shaping is broken after taking care of Indic
...
- revert back to old working code where the script was setup for Harfbuzz\
depending of the direction of the run
Change-Id: I7ec740732b51ccf05b6744b7f9d2fcb35555478d
2011-08-16 17:14:20 -07:00
Christopher Tate
755bd67a50
Merge "Don't crash if a drag recipient throws an uncaught exception"
2011-08-16 17:03:24 -07:00
Adam Powell
751b85e8c3
Merge "Fix bug 5048082 - Conversation doesn't scroll after you send a message"
2011-08-16 16:46:48 -07:00
Amith Yamasani
d140605fb4
Merge "Rename an asset and update ic_commit_* drawables."
2011-08-16 16:45:13 -07:00
Adam Powell
ee78b173aa
Fix bug 5048082 - Conversation doesn't scroll after you send a message
...
Fix TRANSCRIPT_MODE_NORMAL to work properly when multiple data set change
events happen before a relayout.
Change-Id: If866f7c649c1119d088020f1231b916047402b8c
2011-08-16 16:39:59 -07:00
Amith Yamasani
ed2d658af0
Merge "Move the padding to the text field in SearchView."
2011-08-16 16:19:56 -07:00
Christopher Tate
d9be36c897
Don't crash if a drag recipient throws an uncaught exception
...
There turn out to be two distinct bugs leading to runtime restarts.
The first, dating from at least Android 3.1, is that following certain kinds
of app crashes we properly clean up the drag-state bookkeeping, but aren't
prepared in the case of the drag-target timeout clock firing with a now-
null drag state in effect. We now catch that edge condition and don't NPE
(and note that there was already similar code around the separate timeout
when an app is *starting* the drag process).
The second bug is that some new-in-ICS code in the input channel management
wasn't prepared for certain cases where the current touch window could have
become unusable and its input channel torn down summarily in the case of the
aforesaid app crash during drag. The code now makes sure that there really
is an input channel that needs to be flushed / cancelled prior to attempting
that operation.
Fixes bug 5173534
Change-Id: Idaae158ecfb4b93456ab1425769b669962893c00
2011-08-16 16:09:33 -07:00
Erik Gilling
bb04b678cd
Merge "Set rotation to landscape on HDMI instead of 0"
2011-08-16 15:57:24 -07:00
Erik Gilling
10a058c96b
Set rotation to landscape on HDMI instead of 0
...
When the native orientation of the device is not landscape HDMI display
will be wrong.
Change-Id: Ie1d4f6b7247e0a43ff13b5318b644ec7cff293f2
Signed-off-by: Erik Gilling <konkers@android.com>
2011-08-16 15:45:34 -07:00
Amith Yamasani
465b08cf4d
Move the padding to the text field in SearchView.
...
Side padding/margins were being applied to both the iconified
and the expanded view. This moves the margin to just the expanded view.
Bug: 5081112
Change-Id: I08c8cd97db2c893a0404065555d2770a6ab902ec
2011-08-16 15:38:42 -07:00
Amith Yamasani
69566a663b
Rename an asset and update ic_commit_* drawables.
...
Bug: 5167680
Change-Id: I90b48c8600dba02d8f84c18a7b61f4b041544f0b
2011-08-16 15:26:25 -07:00
Adam Powell
81de845622
Merge "Fix bug 5165771 - Gmail: crash on launch from notifier"
2011-08-16 15:24:51 -07:00
Huahui Wu
3a81ac4a21
Merge "b/5080166 Enalbe multi-touch on external touch escreen."
2011-08-16 15:09:08 -07:00
Russell Brenner
868b387ef7
Merge "Add Lohit-Hindi.ttf as a system fallback font"
2011-08-16 15:06:16 -07:00
Adam Powell
3bb421d5b8
Fix bug 5165771 - Gmail: crash on launch from notifier
...
Change-Id: Iec9c189bd3fa5e62bc8eb520ca2a1dd4db106036
2011-08-16 15:05:09 -07:00
repo sync
4a56c437b6
Merge "P2p enhancements"
2011-08-16 14:50:56 -07:00
Andreas Huber
3b2d54a0e7
Merge "Error handling in ACodec and Nuplayer."
2011-08-16 14:37:51 -07:00
Romain Guy
4f536b3ba8
Merge "Prevent NPE in HardwareRenderer Bug #5169815 "
2011-08-16 14:30:50 -07:00
Romain Guy
86e3e22ba8
Prevent NPE in HardwareRenderer
...
Bug #5169815
Change-Id: I168b61f3a6cea679e455cf28282b69bb7f3072e5
2011-08-16 14:30:08 -07:00
Chia-chi Yeh
1db7f7940e
Merge "VPN: reset legacy VPN when resetting IPv4 addresses."
2011-08-16 14:25:30 -07:00
Fred Quintana
f01e16a0ff
Merge "add the Identity contacts mimetype Bug: 5061729"
2011-08-16 14:19:59 -07:00
Fred Quintana
4923f1d0d9
add the Identity contacts mimetype
...
Bug: 5061729
Change-Id: Icdc0dd50666463f73b5b05ae1459ae34150153cc
2011-08-16 14:12:17 -07:00
Mike Lockwood
33ffb3661e
Merge "UsbManager: Use resource IDs for notification IDs"
2011-08-16 14:06:59 -07:00
Romain Guy
2ce81fcd7d
Merge "Add an API to set the transform on a TextureView's surface texture. Bug #5156689 "
2011-08-16 13:56:38 -07:00
Romain Guy
302a9df1d5
Add an API to set the transform on a TextureView's surface texture.
...
Bug #5156689
Change-Id: I635a625885c9b832a60d44ece0de7613ceb84109
2011-08-16 13:55:02 -07:00
Andreas Huber
d84fd7927e
Error handling in ACodec and Nuplayer.
...
Codec errors (and codec not found errors) now trigger a controlled shutdown
of playback and signal errors to the MediaPlayer client.
Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
2011-08-16 13:48:44 -07:00
Mike Lockwood
fadd2b8e0f
UsbManager: Use resource IDs for notification IDs
...
to avoid ID collisions with other system services.
Bug: 5161005
Change-Id: I069fbc40a8764bc85cceeacd04264abd32b62668
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-16 13:45:51 -07:00
Russell Brenner
36de369b19
Add Lohit-Hindi.ttf as a system fallback font
...
Bug: 5087744
Change-Id: Iccb695d082a3ad06f61384f097db2518bcb18a63
2011-08-16 13:44:45 -07:00
Amith Yamasani
10dc6fb4d0
Merge "Updated audio volume icons."
2011-08-16 13:35:50 -07:00
Amith Yamasani
16d09c20f9
Updated audio volume icons.
...
Bug: 5117986
Change-Id: I64a8b61d3137730dec4d8f15ae5e8a1e07f9ac63
2011-08-16 13:31:21 -07:00
Dianne Hackborn
47a105a720
Merge "Small improvements to am command."
2011-08-16 13:26:12 -07:00
Dianne Hackborn
0bb1e9139e
Small improvements to am command.
...
The start command can now take a package name or component name
for easier starting. New -S option allows you to force stop an
app before starting it.
Change-Id: I5c55b34dd794783f0f5f51851dc811b8c1b39b76
2011-08-16 13:24:53 -07:00
Gilles Debunne
4cee03a85f
Merge "Change the behavior of SuggestionSpan."
2011-08-16 13:23:25 -07:00
Daniel Sandler
e91e745254
Merge "Make the navigation bar opaque."
2011-08-16 13:11:04 -07:00
Adam Powell
06ad3f19f5
Merge "Offer a masked version of setUiOptions for windows to only modify certain flags."
2011-08-16 13:10:55 -07:00
Adam Powell
e43fca9957
Offer a masked version of setUiOptions for windows to only modify certain flags.
...
Change-Id: I36aaff982767f8984c468e8c13f8d5ec8c3c0040
2011-08-16 13:07:22 -07:00
Mike Lockwood
92bebc3259
Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"
2011-08-16 13:07:17 -07:00
Andreas Huber
f6e364e8c3
Merge "Properly initialize some instance variables."
2011-08-16 13:06:19 -07:00