55662 Commits

Author SHA1 Message Date
Philip Milne
899d592287 Fix for http://b/issue?id=5081478
GridLayout needs to call measure on children after it knows how large children should be

Also:

. Remove deprecated methods and XML attributes.
. Stop Spaces having margins by default.
. Remove getSpacers() and findUsed()
. Change default for row/columnOrderPreserved() from false to true.
. Improve automatic index allocation mechanism to use individual maxima.

Change-Id: Id79fbb2e70a0bf2002191ec2a9746547d896de72
2011-08-02 16:01:28 -07:00
Andreas Huber
5c31583c53 Merge "Fix NALU extraction of unit starts with a 0x00 nalType" 2011-08-01 13:26:11 -07:00
Jamie Gennis
d356b2d5e3 Merge "SurfaceTexture: allow set_buffer_count(2)" 2011-08-01 13:25:03 -07:00
Andreas Huber
05ea63da20 Fix NALU extraction of unit starts with a 0x00 nalType
by not backing up beyond the start of the nal unit.

Change-Id: I5fba9913202de416e634e5f39181be62b72b2469
related-to-bug: 4770290
2011-08-01 13:22:26 -07:00
Romain Guy
115cf05853 Merge "Fixing initialization cleanup in activity instrumentation test case" 2011-08-01 13:21:31 -07:00
Rodrigo Damazio Bovendorp
3fe3f7328f Fixing initialization cleanup in activity instrumentation test case
Change-Id: I798fed657ccdc27430edc07d1e911b34c45426b5
2011-08-01 17:10:58 -03:00
Dianne Hackborn
c98c3597ab Merge "Hide permissions that are not available to apps." 2011-08-01 12:23:47 -07:00
Mathias Agopian
05083e5724 Merge "improve GraphicAllocator dump method" 2011-08-01 12:15:07 -07:00
Jeff Brown
07c6cc7b7b Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943" 2011-08-01 12:14:24 -07:00
Jamie Gennis
a207262612 Merge "SurfaceFlinger: abandon Layer SurfaceTextures" 2011-08-01 12:10:47 -07:00
Dianne Hackborn
24a12104fd Hide permissions that are not available to apps.
Change-Id: I5f3bc72114b780fffe218a5600bfd011ede029d3
2011-08-01 11:25:53 -07:00
Eric Fischer
9e9c8c5f0a am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '72b7a7d90b631a703681751c02f1447e3c75ccb0':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:23:08 -07:00
Eric Fischer
72b7a7d90b am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:19:59 -07:00
Eric Fischer
f01b3cfa9a am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
2011-08-01 11:17:17 -07:00
Eric Fischer
c0e5967fb9 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Andreas Huber
704972acef Merge "Start playing live streaming HLS content from the first segment." 2011-08-01 10:46:51 -07:00
Matthew Xie
569980c349 Merge "Change setDevicePropertyNative to no block." 2011-08-01 10:20:30 -07:00
Andreas Huber
37e477c227 Start playing live streaming HLS content from the first segment.
Also properly signal a "hard" discontinuity, i.e. a possible format change
when a discontinuity is signalled explicitly as part of the playlist.

Change-Id: Ic347d3d11d39b0411c3726a7c723bcf13092b8bc
related-to-bug: 5103155, 5103013
2011-08-01 10:06:25 -07:00
Luca Zanolin
7702a59344 Merge "Sort the suggestions based based on the length of the text they are attached too." 2011-08-01 09:51:29 -07:00
Mike Lockwood
6031b5de96 Merge "MediaScanner: Move genre table management to MediaProvider" 2011-08-01 09:31:57 -07:00
Justin Ho
9a6c7383b3 Merge "Update list_ states Bug: 5076695" 2011-08-01 07:27:11 -07:00
Luca Zanolin
e3f89c08f2 Sort the suggestions based based on the length of the text they are attached too.
When the suggestions are displayed, the shortest one will be at the top of the list, as they are the most relevant one.

Bug: 5006130

Change-Id: Id3ac3accce5198a6a58a0c3028ee5f77957ceac6
2011-08-01 09:57:25 +01:00
Mike Lockwood
e5d0495d52 MediaScanner: Move genre table management to MediaProvider
Fixes problems introduced with bulk insert support

Bug: 5092877

Change-Id: If3c0c9054d5effe0a1d7a75e85635b41ba1591f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-31 17:06:01 -04:00
Jamie Gennis
d995b08353 SurfaceTexture: allow set_buffer_count(2)
This change relaxes an error check in SurfaceTexture::setBufferCount to
allow clients to explicitly set a buffer count of 2.  The clients that
will do this are camera and video decode.  Previously it was thought
that for those clients we would always use async mode, which requires a
minimum of 3 buffers.  However, we now believe that for some devices it
may make sense to use synchronous mode (with 2 buffers) to reduce memory
usage.

Bug: 5088418
Change-Id: I620a0ef75075745be9d6c8219e0246aaf33ba950
2011-07-30 16:00:11 -07:00
Jamie Gennis
a616d880d0 SurfaceFlinger: abandon Layer SurfaceTextures
This change makes the Layer::onRemoved method call
SurfaceTextures::abandon on the layer's SurfaceTexture.  This will cause
all client-initiated operations on the SurfaceTexture to fail.  In
particular, this will result in an error on the client side, rather than
a deadlock when removing a layer that used a SurfaceTexture in
synchronous mode.

Change-Id: I14014d00369f29560a21b606831edee432bb8867
Bug: 5020874
2011-07-30 14:38:20 -07:00
Justin Ho
e8f1cbae44 Merge "Updated backgrounds Bug: 5076695" 2011-07-29 16:55:51 -07:00
Mathias Agopian
8bb824566f improve GraphicAllocator dump method
GraphicAllocator debugging cannot deal with
custom HAL formats. make this more obvious in the
log.

Change-Id: I202e58a7f213f32e725aa4eac62cdf6e50ca5894
2011-07-29 16:35:41 -07:00
Jamie Gennis
f1d459d625 Merge "SurfaceFlinger: fix a layer occlusion bug" 2011-07-29 16:18:38 -07:00
Justin Ho
d75f09f7f9 Merge "Removing unnecessary textfield_active assets Bug: 5094669" 2011-07-29 15:56:15 -07:00
Justin Ho
6f19253fcb Update list_ states
Bug: 5076695

Change-Id: I42bea1e7960db4f1e686382479cd8c8627caccec
2011-07-29 15:51:06 -07:00
Justin Ho
dc922ceb13 Updated backgrounds
Bug: 5076695

Change-Id: Ifc1ee2a9c03b4620df1d27f65faf4c48826b14b6
2011-07-29 15:49:20 -07:00
Romain Guy
1a7b1158c5 Trim HardwareRenderer memory more frequently.
Change-Id: I92e72ce5da324f9ffcfdf7a54d8b368c2531799c
2011-07-29 15:35:58 -07:00
Scott Main
a56d2f666b Merge "add since flag for ICS" 2011-07-29 15:10:27 -07:00
Matthew Xie
3fd36737b3 Change setDevicePropertyNative to no block.
Change setDevicePropertyNative to use async dbus call to bluez instead of
blocking call. The old call was dbus_connection_send_with_reply_and_block.
It is replaced by dbus_connection_send_with_reply.

Change-Id: I1a772b33b54c8aad71a6f4d86dcd289354d8155b
2011-07-29 15:08:41 -07:00
Jesse Wilson
03116780a1 Merge "Restore the 'final' bit on DataInputStream.read()" 2011-07-29 14:41:01 -07:00
Justin Ho
33c5d0842c Removing unnecessary textfield_active assets
Bug: 5094669

Change-Id: I239563cc75d62c1bffa2713e646531dd547752d2
2011-07-29 14:20:25 -07:00
Svetoslav Ganov
0ef92056b7 Merge "Improving accessibility feedback for two state widgets." 2011-07-29 14:06:44 -07:00
Jesse Wilson
a92e5a8a7c Restore the 'final' bit on DataInputStream.read()
This was lost in a recent refactoring.

Change-Id: I31bc9cd5c4015135c4074d9b564edf5a9cc2ecd5
2011-07-29 17:03:19 -04:00
Kristian Monsen
abecca9c60 Merge "Part of fix for bug 4997380: Some error types unknown to SslError" 2011-07-29 12:35:45 -07:00
Derek Sollenberger
ecfeebebff Merge "Add a runtime switch between Raster and Ganesh rendering modes." 2011-07-29 12:34:32 -07:00
Derek Sollenberger
a66754356f Merge "resolved conflicts for merge of 13639b0d to master" 2011-07-29 12:28:16 -07:00
Mike Lockwood
5c5db7c0f0 Merge "Clean up USB configuration switching logic and beef up error handling" 2011-07-29 12:13:04 -07:00
Kristian Monsen
0d6c6a73c6 Part of fix for bug 4997380: Some error types unknown to SslError
Use the new SslError chromium error codes parser.

Change-Id: I0b5584bd3f3e042600caebe72f4e41989318cd6a
2011-07-29 20:10:21 +01:00
Gilles Debunne
9ba79560bf Merge "New interaction model for suggestions" 2011-07-29 11:47:12 -07:00
Mike Lockwood
68736cbf93 Clean up USB configuration switching logic and beef up error handling
Bug: 5050853

Change-Id: Ia00698e2adbb8a7d7698e2ae306413f6c715fbdb
2011-07-29 14:41:14 -04:00
Derek Sollenberger
bbac14ba60 resolved conflicts for merge of 13639b0d to master
Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
2011-07-29 14:39:06 -04:00
Amith Yamasani
44df62c441 Merge "Don't submit a query if it's whitespace only." 2011-07-29 11:28:37 -07:00
Derek Sollenberger
13639b0d07 Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Svetoslav Ganov
b07dbeb572 Merge "InputFilter not updated on global accessibility change." 2011-07-29 11:22:42 -07:00
Christopher Tate
e0fe39387a Merge "Require the current backup pw in all backup/restore operations" 2011-07-29 11:20:45 -07:00