69770 Commits

Author SHA1 Message Date
Marc Blank
b106153ba9 Merge "Use renameTo safely when creating the user 0 account database" 2012-03-18 21:37:52 -07:00
Marc Blank
c6b0f99bb3 Use renameTo safely when creating the user 0 account database
* Because the user directory probably won't exist, the renameTo
  in previous code fails silently

Bug: 6188815
Change-Id: I6afd1bad9bbd1a36de7e93d9e02ed7172b1ed370
2012-03-18 19:18:49 -07:00
Justin Ho
e36f86bce1 DO NOT MERGE Revert "Increase line limit for summary text"
This reverts commit 90e3bcae6771df767c3377ca3bd6c08d99062ca3
2012-03-17 17:09:35 -07:00
Jeff Brown
c0f7366a15 aapt: Preprocess images in parallel.
Currently hardcoded to use up to 4 threads.

This change substantially reduces the amount of time spent
preprocessing framework resources to just a few seconds.

Change-Id: I02fdd283fb529a152aeb22ac87f278779fd77983
2012-03-17 14:12:57 -07:00
Jeff Brown
c9fd9263fe Use quicksort to sort the string pool.
The current implementation of Vector::sort uses insertion sort
on the assumption that the data is mostly sorted.  It isn't.

This change brings the total time spent sorting packages by config
down to 500ms from about 93 seconds.

Bug: 6186278
Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7
2012-03-16 22:25:15 -07:00
Jeff Brown
61361f376b Add some comments about StringPool sort order.
Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb
2012-03-16 22:24:54 -07:00
John Reck
3869fa2294 Include MotionEvent on ACTION_MOVE's TouchEventData
Change-Id: Iaf2aa284d0e794d0d9fa430b7c0da2aedd196ce1
2012-03-16 19:20:00 -07:00
Jeff Brown
bf02b98473 Merge "Remove dead code in StringPool." 2012-03-16 19:10:57 -07:00
Jeff Brown
4eb7fbb250 Merge "Make StringPool entry types trivially movable." 2012-03-16 19:10:47 -07:00
Dianne Hackborn
dea50f05e4 Merge "More work on rotation animation." 2012-03-16 18:29:16 -07:00
Jeff Sharkey
06ba42d5fb Merge "Move StrictMode timers to postAtFrontOfQueue()." 2012-03-16 18:26:48 -07:00
Dianne Hackborn
d6b32b6178 More work on rotation animation.
Change-Id: Ib8206db98b68cb1e0b16e4c55d949e80ff31bd9f
2012-03-16 18:20:07 -07:00
Chet Haase
d3c326e653 Merge "Reduce redundant animation processing" 2012-03-16 18:03:21 -07:00
Eric Laurent
044e7503cc am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit 'eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
2012-03-16 17:29:43 -07:00
Eric Laurent
ec94ecadb7 am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit 'b1853f706371b5050cd8184f5c33955c2f5ae36a':
  MediaPlayerService: fix AudioSink latency
2012-03-16 17:27:09 -07:00
Eric Laurent
eaa08d3515 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
2012-03-16 17:26:24 -07:00
Eric Laurent
eb99caccd7 am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
* commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':
2012-03-16 17:26:15 -07:00
Eric Laurent
0435339072 resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
2012-03-16 17:22:34 -07:00
Eric Laurent
b388138ff2 resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
2012-03-16 17:19:25 -07:00
Xavier Ducrohet
2f14aa169f Merge "LayoutLib: Properly support attr ns when used in styles." 2012-03-16 16:46:00 -07:00
Chet Haase
c6ffab3241 Reduce redundant animation processing
Starting several animations will place separate events onto the
animation queue, which may cause the active animations to get
processed more than once in any frame when one of those start messages
is processed.

This change moves the logic of starting pending animations into
the animation frame processing itself. Now when a start event is
processed, it only calls the animation frame logic if there are
unstarted animations pending.

Issue #6172602 Inconsistent animation callbacks

Change-Id: I3a546f0c849f42b2dd998f099fcdfafd7d780ad9
2012-03-16 16:43:06 -07:00
Jeff Sharkey
3761f33387 Move StrictMode timers to postAtFrontOfQueue().
StrictMode posts a message to estimate how long the main thread was
blocked during a violation.  Currently, any pending messages are
counted against the violation.  To avoid this, switch to using
postAtFrontOfQueue().

Bug: 6119289
Change-Id: I94530632ca678b78b75a698cf9193641b102be9a
2012-03-16 15:46:46 -07:00
Craig Mautner
d87eb6c7c6 Merge "Fix black screen on app transition." 2012-03-16 15:35:21 -07:00
George Mount
9e4fdfae11 Merge "Move the selection handles vertically to match TextView." 2012-03-16 15:31:50 -07:00
Craig Mautner
0059d3508f Fix black screen on app transition.
The layer adjustment to an animating window upon completion was masking
the window behind the mWindowAnimationBackgroundSurface, a DimSurface.
The DimSurface was not being hidden because the step was happening too
late. Swapping the order of performAnimationsLocked and
updateWindowsAppsAndRotationAnimationsLocked fixes this ordering issue.

Fixes bug 6185920.

Change-Id: I0ff64c019e821fa3a92505ac6351f2648897e592
2012-03-16 15:26:01 -07:00
Jeff Brown
345b7eb874 Remove dead code in StringPool.
The sorted string pool option was no longer used.
Neither were strings with associated identifiers.

Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
2012-03-16 15:25:17 -07:00
Jeff Brown
8a9cfcc852 Make StringPool entry types trivially movable.
Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958
2012-03-16 15:24:32 -07:00
Dianne Hackborn
baad5d5f0d Merge "resolved conflicts for merge of 354e0346 to master" 2012-03-16 15:19:51 -07:00
Andreas Huber
b070521ee1 Merge "Report an error instead of waiting for EOS indefinitely in sf2." 2012-03-16 15:19:30 -07:00
Xavier Ducrohet
5d701eddcf LayoutLib: Properly support attr ns when used in styles.
Change-Id: I885864588928589d7c9a34b94339917c5be47fa5
2012-03-16 15:14:02 -07:00
George Mount
f5124e39b8 Move the selection handles vertically to match TextView.
Bug 6185758

Change-Id: I4165f216b5e02cab5b19f10666f28abbb956de03
2012-03-16 15:13:24 -07:00
Dianne Hackborn
29ba7e6680 resolved conflicts for merge of 354e0346 to master
Change-Id: I432f5f43aa1e19c6a474e8656fe0e3715828e8af
2012-03-16 15:03:36 -07:00
Eric Laurent
b1853f7063 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
2012-03-16 15:01:03 -07:00
Eric Laurent
393dd03eaf am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
  AudioTrack: relax check on minimum buffer size
2012-03-16 15:01:01 -07:00
Eric Laurent
2a0d685ed6 Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 2012-03-16 14:58:21 -07:00
Eric Laurent
3fe7ee651d Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 2012-03-16 14:58:07 -07:00
Victoria Lease
793ce52d7c Merge "proposed public API for asynchronous find-on-page" 2012-03-16 14:56:11 -07:00
Victoria Lease
abeb6a7915 proposed public API for asynchronous find-on-page
Bug: 6052412

Change-Id: I63bff3bfda50eede958cb885f5068ae94bdcfe7d
2012-03-16 14:19:37 -07:00
John Reck
a5408e619a Pipe down isHardwareAccelerated
Change-Id: I19285ea03409279aea09f9e44a1870364762f877
2012-03-16 14:18:44 -07:00
Amith Yamasani
634db5823f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-16 14:17:09 -07:00
Amith Yamasani
65e4b90d6c am 31f7ef24: am 90e3bcae: Increase line limit for summary text
* commit '31f7ef2436ca7cbe754f33d536593f9640a31fb0':
  Increase line limit for summary text
2012-03-16 14:17:05 -07:00
Amith Yamasani
579922e331 am 5fd6deb0: am 90e3bcae: Increase line limit for summary text
* commit '5fd6deb0497d6763514f125b5fde69ee4efdc3c2':
  Increase line limit for summary text
2012-03-16 14:16:27 -07:00
Amith Yamasani
31f7ef2436 am 90e3bcae: Increase line limit for summary text
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
2012-03-16 14:13:48 -07:00
Amith Yamasani
5fd6deb049 am 90e3bcae: Increase line limit for summary text
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
2012-03-16 14:13:45 -07:00
Craig Mautner
1dd3ed09e8 Perform finish animation actions.
When stepAnimation returns false, do not return false immediately.
Instead carry out finish actions. Also, remove state machine that is no
longer necessary.

Fixes bug 6184070.

Change-Id: I530eb2b62b864bbce929f573d10b31b102152f1f
2012-03-16 14:05:07 -07:00
Andreas Huber
a7110640d0 Report an error instead of waiting for EOS indefinitely in sf2.
Change-Id: Id7bcfb90a3b6a61f0df8bd8f39ea4ffa3c433d87
2012-03-16 13:19:20 -07:00
Andreas Huber
4108fbc299 Merge "ACodec is a little more aggressive in its error checking now." 2012-03-16 13:15:53 -07:00
Amith Yamasani
90e3bcae67 Increase line limit for summary text
Doing this to accomodate some really long warning text in a
checkbox widget. Needs 5 lines for English. Probably a lot
more for German, etc., so increasing it to 10 lines.

Please don't abuse that. 4 lines is still a reasonable max.

Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
2012-03-16 13:13:50 -07:00
Eric Laurent
dc63f3fe40 MediaPlayerService: fix AudioSink latency
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.

This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.

Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4

Conflicts:

	media/libmediaplayerservice/MediaPlayerService.cpp
2012-03-16 12:25:31 -07:00
Eric Laurent
0df689495a AudioTrack: relax check on minimum buffer size
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.

Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.

Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f

Conflicts:

	media/libmedia/AudioTrack.cpp
2012-03-16 12:22:07 -07:00