Amith Yamasani
5333195ba0
Merge "Make Volume control non-modal and allow touches underneath to take effect."
2011-09-19 10:03:14 -07:00
Jean-Michel Trivi
608a9f408e
am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
...
* commit '2f153169594249738d63aa6e2897d257f6b7d71e':
Bug 5300223 RemoteControlClient uses PendingIntent for media button events
2011-09-19 09:51:29 -07:00
Adam Powell
8ea6c58907
Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
2011-09-19 09:47:01 -07:00
Jean-Michel Trivi
b84fd9ffe1
Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
2011-09-19 09:46:32 -07:00
Andreas Huber
f969821a3c
Merge "In order to recover from video lagging behind audio, drop avc frames"
2011-09-19 08:54:59 -07:00
The Android Open Source Project
6c8697d078
Reconcile with ics-factoryrom-release
...
Change-Id: Ic1b2b256832ba7fc797180de3c0b29380f6355d9
2011-09-19 08:00:42 -07:00
The Android Automerger
2ecb694c4a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-19 06:28:09 -07:00
Jeff Sharkey
cb3f71644f
Merge "Sample atomic network stats buckets, full poll."
2011-09-18 17:03:15 -07:00
Justin Ho
cb3bd8d7dd
am 31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
...
* commit '31f971b57f526e2688241080b30c7e8df33bf62d':
Properly adding scrubber pressed/selected state
2011-09-18 16:58:20 -07:00
Justin Ho
d9e2e2bbc1
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
2011-09-18 16:56:12 -07:00
Adam Powell
a1b41922da
Merge "Fix bug 5279720 - Legacy theme EditText coloring"
2011-09-18 16:52:12 -07:00
Jeff Sharkey
d240b6f65b
am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
...
* commit 'aaf301736e923db15918617145069658696be453':
DO NOT MERGE: Sample atomic network stats buckets, full poll.
2011-09-18 16:21:38 -07:00
Jeff Sharkey
579288a63b
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
2011-09-18 16:20:00 -07:00
Jeff Sharkey
96b2fbbce2
am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
...
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
Collect and persist tethering stats.
2011-09-18 16:17:39 -07:00
Jeff Sharkey
5280510bbe
Merge "Collect and persist tethering stats." into ics-factoryrom
2011-09-18 16:15:51 -07:00
Adam Powell
b69b7cc5c9
Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode"
2011-09-18 15:39:05 -07:00
Dianne Hackborn
52a5152eb6
Merge "Fix issue #5242779 : Device not responding to touch on unlock screen"
2011-09-18 14:53:27 -07:00
Irfan Sheriff
c8d0838669
Merge "Retain DNS information from DHCP request"
2011-09-18 13:31:12 -07:00
Fabrice Di Meglio
44198f1b88
Merge "Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits""
2011-09-18 12:58:47 -07:00
The Android Automerger
ea2367853e
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-18 06:27:55 -07:00
Dirk Dougherty
54f0bf15b2
Merge "doc change: fix attr name"
2011-09-17 16:10:28 -07:00
Jeff Brown
8756f2ec60
am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom
...
* commit '79aa40302b643ee6c6227ee354a1b1378e721568':
Can't stop the fling! Bug: 5335420
2011-09-16 23:30:52 -07:00
Jeff Brown
77daff7712
Merge "Can't stop the fling! Bug: 5335420" into ics-factoryrom
2011-09-16 23:29:15 -07:00
Wink Saville
f897156b39
am 259db3f6: Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
...
* commit '259db3f66f8cbbf1eadec9c6b76d7e476318486c':
Have all connections disconnected before turning off radio.
2011-09-16 22:02:31 -07:00
Wink Saville
3b01d26e58
Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
2011-09-16 22:00:34 -07:00
Jeff Brown
df9440f62f
Can't stop the fling!
...
Bug: 5335420
Fixed a bug in VelocityTracker where the output velocity was
not being set to zero when not available.
Added a condition to ensure that the velocity is at least
the minimum fling velocity before continuing. If not, then
the user is trying to stop the fling and scroll more precisely.
Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
2011-09-16 21:43:58 -07:00
Jeff Brown
d80ca9beab
Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924 ""
2011-09-16 21:03:15 -07:00
Tsu Chiang Chuang
a8bc0dd7f4
Merge "Force an update before we poll for the data."
2011-09-16 17:48:35 -07:00
Tsu Chiang Chuang
70f1ad2d15
Merge "add upload capabilities to data test."
2011-09-16 17:48:17 -07:00
Mathias Agopian
f297a35ff4
am 1afeea0f: (-s ours) Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
...
* commit '1afeea0f207f8b8b781f799f5d150b70495abb1a':
work around a problem where fp registers get corrupted (DO NOT MERGE)
2011-09-16 17:09:33 -07:00
Mathias Agopian
0d8088e8f1
Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
2011-09-16 17:08:21 -07:00
Fabrice Di Meglio
30aacb9d96
Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
2011-09-16 17:07:08 -07:00
Romain Guy
5e5a43e485
Merge "Forces AsyncTask to use the main looper Bug #5333924 "
2011-09-16 16:50:22 -07:00
Romain Guy
e64761b3e9
Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587 "
2011-09-16 16:20:17 -07:00
Eric Fischer
8b92fec903
am a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit 'a2a960b4a14f473f7677694973b5b9274eccc516':
Import revised translations. DO NOT MERGE
2011-09-16 16:19:19 -07:00
Eric Fischer
8d7c5ea0fd
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-16 16:17:45 -07:00
Jeff Sharkey
817d975f37
Merge "Fix "am profile" when run on system_server."
2011-09-16 15:11:06 -07:00
Jean-Michel Trivi
09175670a7
am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
...
* commit 'f79ec360984011c49c52b7a19b96cbbc932df4be':
Fix bug 5327199 Recycle bitmaps in RemoteControlClient
2011-09-16 15:02:43 -07:00
Jean-Michel Trivi
7990b9d409
Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
2011-09-16 15:01:06 -07:00
Justin Ho
fafa5f0042
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
0390fd7eb3
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
2011-09-16 14:47:54 -07:00
John Reck
49e81d4426
Merge "Don't switch to handle drag mode when starting selection"
2011-09-16 14:24:33 -07:00
Justin Ho
9786b94840
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
a6a42ff456
Merge "Adding selected state for scrubber control" into ics-factoryrom
2011-09-16 14:15:04 -07:00
Nick Kralevich
77a8b08682
Merge "AudioResampler: use relative instead of absolute labels"
2011-09-16 13:56:16 -07:00
Jeff Brown
0dd2f48612
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
8096736926
Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
2011-09-16 13:44:35 -07:00
Dianne Hackborn
b72c291402
Merge ""Fix" issue #5276520 : Noise on edges of rotation animation"
2011-09-16 13:43:01 -07:00
Jeff Brown
d20d20b5da
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
2011-09-16 13:42:46 -07:00
John Reck
eb2afca1a7
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