Justin Ho
ceed599a4a
am 07adee4a: am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
...
* commit '07adee4a559e1655c5c1c1ec2f3b9bc15c33ea61':
Revert "Adding selected state for scrubber control"
2011-09-16 14:50:57 -07:00
Justin Ho
07adee4a55
am 218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
...
* commit '218148f1ffb574282bdc72a1a4cc97b7129cf043':
Revert "Adding selected state for scrubber control"
2011-09-16 14:49:17 -07:00
Justin Ho
218148f1ff
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
2011-09-16 14:47:54 -07:00
Justin Ho
783ed0d647
Revert "Adding selected state for scrubber control"
...
This reverts commit a11aeeb36560959db321f9757d4c5eccfdfa7f63
2011-09-16 14:47:40 -07:00
John Reck
2e5b2925df
am 2582890b: Merge "Don\'t switch to handle drag mode when starting selection"
...
* commit '2582890b2b5201566b4cba068ba3cfd77a3747e8':
Don't switch to handle drag mode when starting selection
2011-09-16 14:25:55 -07:00
John Reck
2582890b2b
Merge "Don't switch to handle drag mode when starting selection"
2011-09-16 14:24:33 -07:00
Justin Ho
8dde71a558
am 9e1184f2: am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
...
* commit '9e1184f2efda48c93eee356b0b4c420f77747cb2':
Adding selected state for scrubber control
2011-09-16 14:19:04 -07:00
Justin Ho
9e1184f2ef
am 5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
...
* commit '5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
2011-09-16 14:16:53 -07:00
Justin Ho
5855c0ca68
Merge "Adding selected state for scrubber control" into ics-factoryrom
2011-09-16 14:15:04 -07:00
Justin Ho
a11aeeb365
Adding selected state for scrubber control
...
Change-Id: I63147c80f7849d28ffe15d97e0b7e3f5c7bea5e1
2011-09-16 14:11:07 -07:00
Nick Kralevich
025e1930b7
am 9404e1fb: Merge "AudioResampler: use relative instead of absolute labels"
...
* commit '9404e1fbd983c16667b9ec31941038c7af2df803':
AudioResampler: use relative instead of absolute labels
2011-09-16 13:57:35 -07:00
Nick Kralevich
9404e1fbd9
Merge "AudioResampler: use relative instead of absolute labels"
2011-09-16 13:56:16 -07:00
Jeff Brown
fbbfd7290e
am ff242c3e: (-s ours) am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
...
* commit 'ff242c3ed58322f8a6625ea66855bba64915e388':
Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776
2011-09-16 13:46:59 -07:00
Adam Powell
0ffc530b49
am 0dcb3a6d: Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
...
* commit '0dcb3a6deacf40af243b99dbf62b9a9173f1d8b5':
Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls.
2011-09-16 13:46:56 -07:00
Dianne Hackborn
7cd07b1dcc
am 0db4bdb2: Merge ""Fix" issue #5276520 : Noise on edges of rotation animation"
...
* commit '0db4bdb24dcde4cce81f3852d3eeb1caf580f2b1':
"Fix" issue #5276520 : Noise on edges of rotation animation
2011-09-16 13:44:46 -07:00
Jeff Brown
ff242c3ed5
am a82f4483: (-s ours) Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
...
* commit 'a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac':
Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776
2011-09-16 13:44:40 -07:00
Adam Powell
0dcb3a6dea
Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
2011-09-16 13:44:35 -07:00
Dianne Hackborn
0db4bdb24d
Merge ""Fix" issue #5276520 : Noise on edges of rotation animation"
2011-09-16 13:43:01 -07:00
Jeff Brown
a82f448373
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
2011-09-16 13:42:46 -07:00
Jeff Brown
3fccb86b31
Make LTE_FLOAT a strict weak order. (DO NOT MERGE)
...
Bug: 5327776
Currently LTE_FLOAT isn't even a valid partial order, let alone
a strict weak order as needed by binary search. Consequently,
KeyedVectors with keys whose types have operator< using LTE_FLOAT
sometimes find the wrong values!
This problem affects several graphics caches including the
TextLayoutCache.
(This is still not a total order because NaNs are not comparable
but hopefully we don't ever search for NaNs this way!)
Change-Id: Ic447a34c7d87f681ee81538f22a0937a039072dd
2011-09-16 13:35:01 -07:00
John Reck
bc69cae565
am 1bf1b912: (-s ours) am 41d6bfb2: (-s ours) Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
...
* commit '1bf1b9120cee86249a10ef43faf820b1c1f0281c':
DO NOT MERGE Fix text selection drawing on SW
2011-09-16 13:26:05 -07:00
John Reck
c99e447ea7
Don't switch to handle drag mode when starting selection
...
Bug: 5327408
Change-Id: Ibda37b1a661d9cdc80a86bc16488178b69fac4a2
2011-09-16 13:23:43 -07:00
John Reck
1bf1b9120c
am 41d6bfb2: (-s ours) Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
...
* commit '41d6bfb27909c2f27e41b5aa1d182e00b4c2f631':
DO NOT MERGE Fix text selection drawing on SW
2011-09-16 13:23:37 -07:00
John Reck
41d6bfb279
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
2011-09-16 13:21:31 -07:00
Nick Kralevich
80754d2078
AudioResampler: use relative instead of absolute labels
...
This change is needed to allow Android to compile with -fPIE
Bug: 5328392
Change-Id: I84d947975776800a7b79c6ac75a881af461a631c
2011-09-16 13:14:16 -07:00
Jeff Brown
1afa74c7f7
am bb0bccba: Merge "Make LTE_FLOAT a strict weak order. Bug: 5327776"
...
* commit 'bb0bccba23849de34fb8b8d96fa90f653e86fbab':
Make LTE_FLOAT a strict weak order. Bug: 5327776
2011-09-16 13:13:02 -07:00
Jeff Brown
bb0bccba23
Merge "Make LTE_FLOAT a strict weak order. Bug: 5327776"
2011-09-16 13:11:24 -07:00
Adam Powell
4b86788003
Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow
...
calls.
If a View is added to a ViewGroup during the ViewGroup's
onAttachedToWindow method, the child can receive two calls to
onAttachedToWindow. Guard against this.
Change-Id: I845d0cb2c9172071eee1eadc6bc2dd282ee0ef43
2011-09-16 13:01:01 -07:00
Mathias Agopian
2df362c8fb
am 4920fde8: Merge "cleanup: fix typos in logs"
...
* commit '4920fde825678676da038497c41bf800bc876ef6':
cleanup: fix typos in logs
2011-09-16 12:59:54 -07:00
Mathias Agopian
4920fde825
Merge "cleanup: fix typos in logs"
2011-09-16 12:58:30 -07:00
Fred Quintana
f338522cba
am 43a5070c: am 3d5759b5: Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
...
* commit '43a5070c1ca89053afb8fb97cb1389cb64840770':
Add a generic account chooser/add account flow for apps.
2011-09-16 12:16:28 -07:00
Fred Quintana
43a5070c1c
am 3d5759b5: Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
...
* commit '3d5759b527fd0e48cfcc759dfed68fbe5a4dd050':
Add a generic account chooser/add account flow for apps.
2011-09-16 12:14:31 -07:00
Fred Quintana
3d5759b527
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
2011-09-16 12:13:30 -07:00
Jeff Brown
13ede62fd7
Make LTE_FLOAT a strict weak order.
...
Bug: 5327776
Currently LTE_FLOAT isn't even a valid partial order, let alone
a strict weak order as needed by binary search. Consequently,
KeyedVectors with keys whose types have operator< using LTE_FLOAT
sometimes find the wrong values!
This problem affects several graphics caches including the
TextLayoutCache.
(This is still not a total order because NaNs are not comparable
but hopefully we don't ever search for NaNs this way!)
Change-Id: Ic447a34c7d87f681ee81538f22a0937a039072dd
2011-09-16 12:00:05 -07:00
Mathias Agopian
53f6cdd94d
cleanup: fix typos in logs
...
Change-Id: Ib5744564a873ea2b84100174673dc4d3ae109fcf
2011-09-16 11:56:40 -07:00
Andreas Huber
4cf593da73
am 86d7db52: Fix androidGetThreadPriority for non-pthread configurations.
...
* commit '86d7db52bf0cce0d76abc40cc25bf4f1d96d59cd':
Fix androidGetThreadPriority for non-pthread configurations.
2011-09-16 11:55:09 -07:00
John Reck
e668b03ac7
DO NOT MERGE Fix text selection drawing on SW
...
Bug: 5312770
Helps if you actually draw stuff...
Cherry pick from master
Change-Id: Iae4e7fbd2dc6a5306e8ca8735580e1f2eb50f276
2011-09-16 11:50:11 -07:00
Andreas Huber
86d7db52bf
Fix androidGetThreadPriority for non-pthread configurations.
...
related-to-build
Change-Id: Ic865af0865906f96fd615a56a030c8e3adaf13c4
2011-09-16 11:47:13 -07:00
Eino-Ville Talvala
d07acd5e5a
am 44895fe8: am ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
...
* commit '44895fe865a597963a6a4a1fa0af9c3b2ff164d1':
Add third video to default system videos.
2011-09-16 10:55:41 -07:00
Eino-Ville Talvala
44895fe865
am ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
...
* commit 'ebdcae732f648871dd0df6586a5ba57aae015bd4':
Add third video to default system videos.
2011-09-16 10:53:21 -07:00
Andreas Huber
57e35cf128
am 9e7a6fc1: Merge "Various improvements to nuplayer playback"
...
* commit '9e7a6fc149c83fcb73a73730e59df985e0286227':
Various improvements to nuplayer playback
2011-09-16 10:52:30 -07:00
Andreas Huber
a5d7b09cb3
am d6790989: Merge "A new API "androidGetThreadPriority""
...
* commit 'd679098937eabe9dc4ac8ab3bb1235b318c8fa25':
A new API "androidGetThreadPriority"
2011-09-16 10:52:27 -07:00
Eino-Ville Talvala
ebdcae732f
Merge "Add third video to default system videos." into ics-factoryrom
2011-09-16 10:52:15 -07:00
Andreas Huber
9e7a6fc149
Merge "Various improvements to nuplayer playback"
2011-09-16 10:50:51 -07:00
Andreas Huber
d679098937
Merge "A new API "androidGetThreadPriority""
2011-09-16 10:50:43 -07:00
Andreas Huber
115cac8131
Various improvements to nuplayer playback
...
- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.
- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug 5325201)
- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND
- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.
Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
2011-09-16 10:44:02 -07:00
John Reck
26ed05119e
am 5dd1916c: Merge "Fix text selection drawing on SW"
...
* commit '5dd1916c247f27284e4af8be5125633fddae6452':
Fix text selection drawing on SW
2011-09-16 10:41:11 -07:00
John Reck
5dd1916c24
Merge "Fix text selection drawing on SW"
2011-09-16 10:39:16 -07:00
Andreas Huber
bcba155942
A new API "androidGetThreadPriority"
...
Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
2011-09-16 09:33:22 -07:00
Kenny Root
de2088d322
am 5908eaef: am 1f9a9288: Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
...
* commit '5908eaef126c746aa88448b53cdc69623dee4fb4':
Be more forgiving in parsing verifier IDs
2011-09-16 09:12:27 -07:00