OSDN Git Service
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""
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.
Eino-Ville Talvala [Fri, 16 Sep 2011 17:52:15 +0000 (10:52 -0700)]
Merge "Add third video to default system videos." into ics-factoryrom
Andreas Huber [Fri, 16 Sep 2011 17:50:51 +0000 (10:50 -0700)]
Merge "Various improvements to nuplayer playback"
Andreas Huber [Fri, 16 Sep 2011 17:50:43 +0000 (10:50 -0700)]
Merge "A new API "androidGetThreadPriority""
John Reck [Fri, 16 Sep 2011 17:39:16 +0000 (10:39 -0700)]
Merge "Fix text selection drawing on SW"
Andreas Huber [Thu, 15 Sep 2011 19:21:40 +0000 (12:21 -0700)]
A new API "androidGetThreadPriority"
Change-Id: I6baeead8c70460863343fd557250635fb1e6a170
Kenny Root [Fri, 16 Sep 2011 16:09:30 +0000 (09:09 -0700)]
am
1f9a9288: Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
* commit '
1f9a928864be7cfc76c99b8f69706e739e6a7b08':
Be more forgiving in parsing verifier IDs
Kenny Root [Fri, 16 Sep 2011 16:07:52 +0000 (09:07 -0700)]
Merge "Be more forgiving in parsing verifier IDs" into ics-factoryrom
Justin Ho [Fri, 16 Sep 2011 14:35:43 +0000 (07:35 -0700)]
am
6a7ea58e: Merge "Updated Clock and Roboto fonts Bug:
5243711" into ics-factoryrom
* commit '
6a7ea58e826587aad89791affa29fe51d5c2e58b':
Updated Clock and Roboto fonts Bug:
5243711
Justin Ho [Fri, 16 Sep 2011 14:32:52 +0000 (07:32 -0700)]
Merge "Updated Clock and Roboto fonts Bug:
5243711" into ics-factoryrom
Brian Colonna [Fri, 16 Sep 2011 13:08:22 +0000 (06:08 -0700)]
Merge "Properly laying out FaceLock on lockscreen"
Mark Brophy [Fri, 16 Sep 2011 12:47:49 +0000 (05:47 -0700)]
Merge "Fix typo in SearchManager javadoc."
Svetoslav Ganov [Fri, 16 Sep 2011 01:54:15 +0000 (18:54 -0700)]
am
4e3bee76: Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
* commit '
4e3bee760a7f00e6ef3c89b937558df1ee6fcda0':
MiltiWaveView accessibility improvement.
Svetoslav Ganov [Fri, 16 Sep 2011 01:52:40 +0000 (18:52 -0700)]
Merge "MiltiWaveView accessibility improvement." into ics-factoryrom
Svetoslav Ganov [Fri, 16 Sep 2011 01:50:38 +0000 (18:50 -0700)]
am
2a6798ad: Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
* commit '
2a6798ada499dc1dc33db36a15a6ce07e72968ae':
Touch explorer does not perform tap with the right pointer.
Svetoslav Ganov [Fri, 16 Sep 2011 01:47:49 +0000 (18:47 -0700)]
Merge "Touch explorer does not perform tap with the right pointer." into ics-factoryrom
Ying Wang [Fri, 16 Sep 2011 00:38:46 +0000 (17:38 -0700)]
am
070e7ee2: Merge "Use the correct dependency" into ics-factoryrom
* commit '
070e7ee285792a2cc59e7ed1db17832e8c829275':
Use the correct dependency
Gloria Wang [Fri, 16 Sep 2011 00:38:39 +0000 (17:38 -0700)]
am
91849473: (-s ours) Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug
5327664. Do not merge." into ics-factoryrom
* commit '
918494732741c1fdceda6d2e4ea8930b559f26a4':
If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug
5327664. Do not merge.
Gloria Wang [Fri, 16 Sep 2011 00:38:36 +0000 (17:38 -0700)]
am
62c24d7b: (-s ours) Merge "Cherry-pick from Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug
5252296." into ics-factoryrom
* commit '
62c24d7bfa5a88655ba9981dba2a565c1136a255':
Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug
5252296.
Ying Wang [Fri, 16 Sep 2011 00:19:37 +0000 (17:19 -0700)]
Merge "Use the correct dependency" into ics-factoryrom
Dianne Hackborn [Fri, 16 Sep 2011 00:09:01 +0000 (17:09 -0700)]
Merge "Fix issue #
5300880: setSystemUiVisibility() always triggers a surface reallocation"
Dianne Hackborn [Fri, 16 Sep 2011 00:08:07 +0000 (17:08 -0700)]
Merge "Fix issue #
5317970: Removing active wallpaper from manifest crashes phone"
Gloria Wang [Fri, 16 Sep 2011 00:04:27 +0000 (17:04 -0700)]
Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug
5327664. Do not merge." into ics-factoryrom
Gloria Wang [Fri, 16 Sep 2011 00:04:02 +0000 (17:04 -0700)]
Merge "Cherry-pick from Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug
5252296." into ics-factoryrom
Gloria Wang [Thu, 15 Sep 2011 23:56:41 +0000 (16:56 -0700)]
Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug
5327664."
Christopher Tate [Thu, 15 Sep 2011 23:48:42 +0000 (16:48 -0700)]
Merge "Don't do full backup/restore before setup"
Fred Quintana [Thu, 15 Sep 2011 23:44:53 +0000 (16:44 -0700)]
Merge "Add a generic account chooser/add account flow for apps."
Ed Heyl [Thu, 15 Sep 2011 23:18:27 +0000 (16:18 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Adam Powell [Thu, 15 Sep 2011 22:02:55 +0000 (15:02 -0700)]
Merge "Update docs for RelativeLayout to better explain its interpretation of gravity."
Gilles Debunne [Thu, 15 Sep 2011 21:51:35 +0000 (14:51 -0700)]
Merge "Bug
5319091: Completions delayed in AutoComplete in landscape"
Ashish Sharma [Thu, 15 Sep 2011 21:30:40 +0000 (14:30 -0700)]
Merge "Add packet counts to uid and iface stats. Needed to add Ethernet overhead to uid_stats (IP level) to compare with interface stats (Ethernet level)."
Svetoslav Ganov [Thu, 15 Sep 2011 20:11:44 +0000 (13:11 -0700)]
Merge "TextView should report in an AccessibilityNodeInfo's text its hint if the View text is empty."
Svetoslav Ganov [Thu, 15 Sep 2011 20:11:08 +0000 (13:11 -0700)]
Merge "CalendarView diregarding XML attributes."
Daniel Sandler [Thu, 15 Sep 2011 20:09:29 +0000 (13:09 -0700)]
Merge "Fix MENU icon weirdness."
Gilles Debunne [Thu, 15 Sep 2011 19:43:51 +0000 (12:43 -0700)]
Merge "Bug
5299484: Recipient address in to field is doubled when entering in landscape mode"
Danielle Millett [Thu, 15 Sep 2011 19:14:25 +0000 (12:14 -0700)]
Merge "isPasswordEnabled and isPatternEnabled return true if used as backup method"
John Reck [Thu, 15 Sep 2011 18:49:00 +0000 (11:49 -0700)]
Merge "DO NOT MERGE Fix finalization" into ics-factoryrom
Jamie Gennis [Thu, 15 Sep 2011 18:06:45 +0000 (11:06 -0700)]
Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip"
JP Abgrall [Thu, 15 Sep 2011 17:47:57 +0000 (10:47 -0700)]
Merge "NetworkManagement SocketTagger: Migrate QTagUid support to JNI."
John Reck [Thu, 15 Sep 2011 17:42:25 +0000 (10:42 -0700)]
Merge "Fix finalization"
Gloria Wang [Thu, 15 Sep 2011 17:16:00 +0000 (10:16 -0700)]
Merge "Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug
5252296."
Guang Zhu [Thu, 15 Sep 2011 17:07:27 +0000 (10:07 -0700)]
Merge "log stack trace when finish() or onDestroy() is called"
Kenny Root [Thu, 15 Sep 2011 16:33:06 +0000 (09:33 -0700)]
Merge "Be more forgiving in parsing verifier IDs"
Daniel Sandler [Thu, 15 Sep 2011 14:56:48 +0000 (07:56 -0700)]
Merge "Fix overlapping wifi and airplane icons."
Dianne Hackborn [Thu, 15 Sep 2011 07:32:15 +0000 (00:32 -0700)]
Merge "Final (ha ha) API 14."
Chia-chi Yeh [Thu, 15 Sep 2011 07:06:23 +0000 (00:06 -0700)]
Merge "VpnDialogs: add string description for translation."
Dianne Hackborn [Thu, 15 Sep 2011 05:33:54 +0000 (22:33 -0700)]
Merge "Update the public APIs for finding views by text to optionally use content description."
Jeff Sharkey [Thu, 15 Sep 2011 04:44:19 +0000 (21:44 -0700)]
Merge "Network stats flag to force complete poll."
Jeff Brown [Thu, 15 Sep 2011 04:27:25 +0000 (21:27 -0700)]
Merge "Velocity Tracker II: The Revenge of Velocity Tracker Bug:
5265529"
satok [Thu, 15 Sep 2011 04:13:06 +0000 (21:13 -0700)]
Merge "Call onFinishInputView in onDestroy"
Jeff Sharkey [Thu, 15 Sep 2011 03:27:55 +0000 (20:27 -0700)]
Merge "Change data usage warning notification wording."
Peter Ng [Thu, 15 Sep 2011 03:27:14 +0000 (20:27 -0700)]
Merge "Status_bar_close that works on light and dark"