OSDN Git Service
Jeff Sharkey [Tue, 20 Sep 2011 04:44:00 +0000 (21:44 -0700)]
am
88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
* commit '
88b18eb8c2034e9de35482cc737ef8d608d55867':
Upload correct txPackets count.
Jeff Sharkey [Tue, 20 Sep 2011 04:42:13 +0000 (21:42 -0700)]
Merge "Upload correct txPackets count." into ics-factoryrom
James Dong [Tue, 20 Sep 2011 03:09:00 +0000 (20:09 -0700)]
am
92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '
92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
James Dong [Tue, 20 Sep 2011 03:06:52 +0000 (20:06 -0700)]
Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
Peter Ng [Tue, 20 Sep 2011 02:01:58 +0000 (19:01 -0700)]
Merge "Keyguard padding fixes"
Irfan Sheriff [Tue, 20 Sep 2011 02:01:17 +0000 (19:01 -0700)]
am
3b6377b1: Merge "Add supplication shut down recovery" into ics-factoryrom
* commit '
3b6377b120bb507f93a8f1e7e25bc026de764dd6':
Add supplication shut down recovery
Irfan Sheriff [Tue, 20 Sep 2011 01:58:58 +0000 (18:58 -0700)]
Merge "Add supplication shut down recovery" into ics-factoryrom
Justin Ho [Tue, 20 Sep 2011 01:06:13 +0000 (18:06 -0700)]
Merge "Tuning Overscroller's scroll curve Softer end + rounder curve with less contrast Bug:
5200575"
Justin Ho [Tue, 20 Sep 2011 00:51:38 +0000 (17:51 -0700)]
am
54ecf3c6: Merge "Updated Status bar icons Bug:
5297795" into ics-factoryrom
* commit '
54ecf3c636dda257cbfd22b3bc86afff8c910372':
Updated Status bar icons Bug:
5297795
Justin Ho [Tue, 20 Sep 2011 00:49:53 +0000 (17:49 -0700)]
Merge "Updated Status bar icons Bug:
5297795" into ics-factoryrom
Fred Quintana [Tue, 20 Sep 2011 00:33:20 +0000 (17:33 -0700)]
am
acfd5ebb: Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
* commit '
acfd5ebb49bde9f64c604dfca5cbed8cafa64594':
An extra is being written as one type and read as the wrong type.
Fred Quintana [Tue, 20 Sep 2011 00:30:44 +0000 (17:30 -0700)]
Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom
Ben Komalo [Mon, 19 Sep 2011 23:55:54 +0000 (16:55 -0700)]
am
85a61c4d: Merge "Only run "core" apps when encrypting device." into ics-factoryrom
* commit '
85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f':
Only run "core" apps when encrypting device.
Ben Komalo [Mon, 19 Sep 2011 23:52:37 +0000 (16:52 -0700)]
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
Jeff Brown [Mon, 19 Sep 2011 23:25:51 +0000 (16:25 -0700)]
Merge "TextLayoutCacheKey needs to store start and count."
Jean-Michel Trivi [Mon, 19 Sep 2011 22:39:31 +0000 (15:39 -0700)]
am
6c038506: Merge "Fix bug
5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
* commit '
6c03850616a6e87de3e1943e47605cc5ebb20e2b':
Fix bug
5300223 Lockscreen should recycle bitmaps
Jean-Michel Trivi [Mon, 19 Sep 2011 22:37:23 +0000 (15:37 -0700)]
Merge "Fix bug
5300223 Lockscreen should recycle bitmaps" into ics-factoryrom
John Reck [Mon, 19 Sep 2011 22:27:07 +0000 (15:27 -0700)]
Merge "Disable extract mode in find on page"
Michael Jurka [Mon, 19 Sep 2011 22:11:23 +0000 (15:11 -0700)]
Merge "Speeding up Recent Apps"
Wink Saville [Mon, 19 Sep 2011 22:09:42 +0000 (15:09 -0700)]
am
c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
* commit '
c69396973b8a496e298a7076842b0e34d193651e':
Remove isAnyActiveDataConnection and promote isDisconnected.
Wink Saville [Mon, 19 Sep 2011 22:07:42 +0000 (15:07 -0700)]
Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
Fabrice Di Meglio [Mon, 19 Sep 2011 22:06:34 +0000 (15:06 -0700)]
Merge "TextLayoutCache code refactoring"
Wink Saville [Mon, 19 Sep 2011 22:02:05 +0000 (15:02 -0700)]
am
f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
* commit '
f946c282c2fbe851d6157ed34bbacabdff8f76ba':
Add PROPERTY_IMS_REG_REQUIRED.
Wink Saville [Mon, 19 Sep 2011 21:59:26 +0000 (14:59 -0700)]
Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
Mathias Agopian [Mon, 19 Sep 2011 21:46:40 +0000 (14:46 -0700)]
Merge "fix EGL debugger"
Mathias Agopian [Wed, 14 Sep 2011 01:15:50 +0000 (18:15 -0700)]
fix EGL debugger
always use GL_RGBA, GL_UNSIGNED_BYTE for screen capture
and make sure to handle GL_BGRA_EXT used on some gpu.
Change-Id: If9c973677fec8a5c4e72be22e7ef7d4bf5f008f4
Dianne Hackborn [Mon, 19 Sep 2011 21:39:11 +0000 (14:39 -0700)]
am
2c2ab586: Fix issue #
5260129: Suggestion strip in Talk app not showing all the time
* commit '
2c2ab5864f6037cebac5a4c73ec039f266d0dcfd':
Fix issue #
5260129: Suggestion strip in Talk app not showing all the time
Fred Quintana [Mon, 19 Sep 2011 20:59:21 +0000 (13:59 -0700)]
am
d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
* commit '
d88324d8ab8b98bbc2c21551be3a8981ee431181':
Fixed the javadoc for AccountManager.newChooseAccountIntent()
Dianne Hackborn [Mon, 19 Sep 2011 20:34:15 +0000 (13:34 -0700)]
Merge "Maybe fix issue #
5340190: java.lang.RuntimeException: Unable to start..."
Andreas Huber [Mon, 19 Sep 2011 20:28:47 +0000 (13:28 -0700)]
Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
David Brown [Mon, 19 Sep 2011 19:26:14 +0000 (12:26 -0700)]
Merge "Update code to use location aware isEmergencyNumber."
David Hu [Mon, 19 Sep 2011 19:11:11 +0000 (12:11 -0700)]
Merge "Return the bundle object"
Fabrice Di Meglio [Mon, 19 Sep 2011 18:41:01 +0000 (11:41 -0700)]
Merge "Fix potential leak in TextLayouCache"
Fabrice Di Meglio [Mon, 19 Sep 2011 18:40:51 +0000 (11:40 -0700)]
Merge "Make TextLayoutCache no more dependent on ICU"
John Reck [Mon, 19 Sep 2011 18:07:28 +0000 (11:07 -0700)]
Merge "Bringing back the 'cache"
Gilles Debunne [Mon, 19 Sep 2011 17:50:16 +0000 (10:50 -0700)]
Merge "Bug
5290461: change voice IME underline span color"
Fred Quintana [Mon, 19 Sep 2011 17:46:03 +0000 (10:46 -0700)]
am
79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
* commit '
79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
Continuation of the unified account chooser flow.
Fred Quintana [Mon, 19 Sep 2011 17:43:59 +0000 (10:43 -0700)]
Merge "Continuation of the unified account chooser flow." into ics-factoryrom
Dianne Hackborn [Mon, 19 Sep 2011 17:42:52 +0000 (10:42 -0700)]
Merge "Fix issue #
5260129: Suggestion strip in Talk app not showing all the time"
Michael Jurka [Mon, 19 Sep 2011 17:34:39 +0000 (10:34 -0700)]
am
b0a1f197: Merge "Added "No recent apps" message on phones" into ics-factoryrom
* commit '
b0a1f197303d520d788ba11fcb0ac56f3a3c8604':
Added "No recent apps" message on phones
Michael Jurka [Mon, 19 Sep 2011 17:33:08 +0000 (10:33 -0700)]
Merge "Added "No recent apps" message on phones" into ics-factoryrom
Philip Milne [Mon, 19 Sep 2011 17:18:36 +0000 (10:18 -0700)]
Merge "Fix for http://b/issue?id=
5297155"
Amith Yamasani [Mon, 19 Sep 2011 17:03:14 +0000 (10:03 -0700)]
Merge "Make Volume control non-modal and allow touches underneath to take effect."
Jean-Michel Trivi [Mon, 19 Sep 2011 16:51:29 +0000 (09:51 -0700)]
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
Adam Powell [Mon, 19 Sep 2011 16:47:01 +0000 (09:47 -0700)]
Merge "Fix bug
5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
Jean-Michel Trivi [Mon, 19 Sep 2011 16:46:32 +0000 (09:46 -0700)]
Merge "Bug
5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
Andreas Huber [Mon, 19 Sep 2011 15:54:59 +0000 (08:54 -0700)]
Merge "In order to recover from video lagging behind audio, drop avc frames"
The Android Open Source Project [Mon, 19 Sep 2011 15:00:42 +0000 (08:00 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic1b2b256832ba7fc797180de3c0b29380f6355d9
The Android Automerger [Mon, 19 Sep 2011 13:28:09 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jeff Sharkey [Mon, 19 Sep 2011 00:03:15 +0000 (17:03 -0700)]
Merge "Sample atomic network stats buckets, full poll."
Justin Ho [Sun, 18 Sep 2011 23:58:20 +0000 (16:58 -0700)]
am
31f971b5: Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
* commit '
31f971b57f526e2688241080b30c7e8df33bf62d':
Properly adding scrubber pressed/selected state
Justin Ho [Sun, 18 Sep 2011 23:56:12 +0000 (16:56 -0700)]
Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom
Adam Powell [Sun, 18 Sep 2011 23:52:12 +0000 (16:52 -0700)]
Merge "Fix bug
5279720 - Legacy theme EditText coloring"
Jeff Sharkey [Sun, 18 Sep 2011 23:21:38 +0000 (16:21 -0700)]
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.
Jeff Sharkey [Sun, 18 Sep 2011 23:20:00 +0000 (16:20 -0700)]
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
Jeff Sharkey [Sun, 18 Sep 2011 23:17:39 +0000 (16:17 -0700)]
am
3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom
* commit '
3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
Collect and persist tethering stats.
Jeff Sharkey [Sun, 18 Sep 2011 23:15:51 +0000 (16:15 -0700)]
Merge "Collect and persist tethering stats." into ics-factoryrom
Adam Powell [Sun, 18 Sep 2011 22:39:05 +0000 (15:39 -0700)]
Merge "Fix bug
5333962 - Problems with no action bar/overlay action mode"
Dianne Hackborn [Sun, 18 Sep 2011 21:53:27 +0000 (14:53 -0700)]
Merge "Fix issue #
5242779: Device not responding to touch on unlock screen"
Irfan Sheriff [Sun, 18 Sep 2011 20:31:12 +0000 (13:31 -0700)]
Merge "Retain DNS information from DHCP request"
Fabrice Di Meglio [Sun, 18 Sep 2011 19:58:47 +0000 (12:58 -0700)]
Merge "Revert "Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits""
The Android Automerger [Sun, 18 Sep 2011 13:27:55 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Dirk Dougherty [Sat, 17 Sep 2011 23:10:28 +0000 (16:10 -0700)]
Merge "doc change: fix attr name"
Jeff Brown [Sat, 17 Sep 2011 06:30:52 +0000 (23:30 -0700)]
am
79aa4030: Merge "Can\'t stop the fling! Bug:
5335420" into ics-factoryrom
* commit '
79aa40302b643ee6c6227ee354a1b1378e721568':
Can't stop the fling! Bug:
5335420
Jeff Brown [Sat, 17 Sep 2011 06:29:15 +0000 (23:29 -0700)]
Merge "Can't stop the fling! Bug:
5335420" into ics-factoryrom
Wink Saville [Sat, 17 Sep 2011 05:02:31 +0000 (22:02 -0700)]
am
259db3f6: Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
* commit '
259db3f66f8cbbf1eadec9c6b76d7e476318486c':
Have all connections disconnected before turning off radio.
Wink Saville [Sat, 17 Sep 2011 05:00:34 +0000 (22:00 -0700)]
Merge "Have all connections disconnected before turning off radio." into ics-factoryrom
Jeff Brown [Sat, 17 Sep 2011 04:40:49 +0000 (21:40 -0700)]
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
Jeff Brown [Sat, 17 Sep 2011 04:03:15 +0000 (21:03 -0700)]
Merge "Revert "Forces AsyncTask to use the main looper Bug #
5333924""
Tsu Chiang Chuang [Sat, 17 Sep 2011 00:48:35 +0000 (17:48 -0700)]
Merge "Force an update before we poll for the data."
Tsu Chiang Chuang [Sat, 17 Sep 2011 00:48:17 +0000 (17:48 -0700)]
Merge "add upload capabilities to data test."
Mathias Agopian [Sat, 17 Sep 2011 00:09:33 +0000 (17:09 -0700)]
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)
Mathias Agopian [Sat, 17 Sep 2011 00:08:21 +0000 (17:08 -0700)]
Merge "work around a problem where fp registers get corrupted (DO NOT MERGE)" into ics-factoryrom
Fabrice Di Meglio [Sat, 17 Sep 2011 00:07:08 +0000 (17:07 -0700)]
Merge "Fix bug #
5332081 TextLayoutCache needs to be able to have more cache hits"
Romain Guy [Fri, 16 Sep 2011 23:50:22 +0000 (16:50 -0700)]
Merge "Forces AsyncTask to use the main looper Bug #
5333924"
Romain Guy [Fri, 16 Sep 2011 23:20:17 +0000 (16:20 -0700)]
Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #
5331587"
Eric Fischer [Fri, 16 Sep 2011 23:19:19 +0000 (16:19 -0700)]
am
a2a960b4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
a2a960b4a14f473f7677694973b5b9274eccc516':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 23:17:45 +0000 (16:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Jeff Sharkey [Fri, 16 Sep 2011 22:11:06 +0000 (15:11 -0700)]
Merge "Fix "am profile" when run on system_server."
Jean-Michel Trivi [Fri, 16 Sep 2011 22:02:43 +0000 (15:02 -0700)]
am
f79ec360: Merge "Fix bug
5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
* commit '
f79ec360984011c49c52b7a19b96cbbc932df4be':
Fix bug
5327199 Recycle bitmaps in RemoteControlClient
Jean-Michel Trivi [Fri, 16 Sep 2011 22:01:06 +0000 (15:01 -0700)]
Merge "Fix bug
5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
Justin Ho [Fri, 16 Sep 2011 21:49:17 +0000 (14:49 -0700)]
am
218148f1: Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
* commit '
218148f1ffb574282bdc72a1a4cc97b7129cf043':
Revert "Adding selected state for scrubber control"
Justin Ho [Fri, 16 Sep 2011 21:47:54 +0000 (14:47 -0700)]
Merge "Revert "Adding selected state for scrubber control"" into ics-factoryrom
John Reck [Fri, 16 Sep 2011 21:24:33 +0000 (14:24 -0700)]
Merge "Don't switch to handle drag mode when starting selection"
Justin Ho [Fri, 16 Sep 2011 21:16:53 +0000 (14:16 -0700)]
am
5855c0ca: Merge "Adding selected state for scrubber control" into ics-factoryrom
* commit '
5855c0ca68de7103e59e4a6e6996fba528cabd9a':
Adding selected state for scrubber control
Justin Ho [Fri, 16 Sep 2011 21:15:04 +0000 (14:15 -0700)]
Merge "Adding selected state for scrubber control" into ics-factoryrom
Nick Kralevich [Fri, 16 Sep 2011 20:56:16 +0000 (13:56 -0700)]
Merge "AudioResampler: use relative instead of absolute labels"
Jeff Brown [Fri, 16 Sep 2011 20:44:40 +0000 (13:44 -0700)]
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
Adam Powell [Fri, 16 Sep 2011 20:44:35 +0000 (13:44 -0700)]
Merge "Bug
5244365 - Prevent views from receiving multiple onAttachedToWindow calls."
Dianne Hackborn [Fri, 16 Sep 2011 20:43:01 +0000 (13:43 -0700)]
Merge ""Fix" issue #
5276520: Noise on edges of rotation animation"
Jeff Brown [Fri, 16 Sep 2011 20:42:46 +0000 (13:42 -0700)]
Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug:
5327776" into ics-factoryrom
John Reck [Fri, 16 Sep 2011 20:23:37 +0000 (13:23 -0700)]
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
John Reck [Fri, 16 Sep 2011 20:21:31 +0000 (13:21 -0700)]
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
Jeff Brown [Fri, 16 Sep 2011 20:11:24 +0000 (13:11 -0700)]
Merge "Make LTE_FLOAT a strict weak order. Bug:
5327776"
Mathias Agopian [Fri, 16 Sep 2011 19:58:30 +0000 (12:58 -0700)]
Merge "cleanup: fix typos in logs"
Fred Quintana [Fri, 16 Sep 2011 19:14:31 +0000 (12:14 -0700)]
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.
Fred Quintana [Fri, 16 Sep 2011 19:13:30 +0000 (12:13 -0700)]
Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom
Mathias Agopian [Fri, 16 Sep 2011 18:56:40 +0000 (11:56 -0700)]
cleanup: fix typos in logs
Change-Id: Ib5744564a873ea2b84100174673dc4d3ae109fcf
Andreas Huber [Fri, 16 Sep 2011 18:47:13 +0000 (11:47 -0700)]
Fix androidGetThreadPriority for non-pthread configurations.
related-to-build
Change-Id: Ic865af0865906f96fd615a56a030c8e3adaf13c4
Eino-Ville Talvala [Fri, 16 Sep 2011 17:53:21 +0000 (10:53 -0700)]
am
ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
* commit '
ebdcae732f648871dd0df6586a5ba57aae015bd4':
Add third video to default system videos.
OSDN Git Service
