Commit Graph

38752 Commits

Author SHA1 Message Date
Michael Jurka
110586465a Merge "Speeding up Recent Apps" 2011-09-19 15:11:23 -07:00
Wink Saville
e73b4f1fd6 am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
* commit 'c69396973b8a496e298a7076842b0e34d193651e':
  Remove isAnyActiveDataConnection and promote isDisconnected.
2011-09-19 15:09:42 -07:00
Wink Saville
ac864946bc Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom 2011-09-19 15:07:42 -07:00
Fabrice Di Meglio
0ebc52c1ab Merge "TextLayoutCache code refactoring" 2011-09-19 15:06:34 -07:00
Wink Saville
26e4e466a5 am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
* commit 'f946c282c2fbe851d6157ed34bbacabdff8f76ba':
  Add PROPERTY_IMS_REG_REQUIRED.
2011-09-19 15:02:05 -07:00
Wink Saville
f3e74f610a Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom 2011-09-19 14:59:26 -07:00
Mathias Agopian
2e176f34ca Merge "fix EGL debugger" 2011-09-19 14:46:40 -07:00
Mathias Agopian
1ac8b72f4f 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
2011-09-19 14:44:37 -07:00
Dianne Hackborn
4f42fceb38 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
2011-09-19 14:39:11 -07:00
Fred Quintana
57b7983745 am d88324d8: Fixed the javadoc for AccountManager.newChooseAccountIntent()
* commit 'd88324d8ab8b98bbc2c21551be3a8981ee431181':
  Fixed the javadoc for AccountManager.newChooseAccountIntent()
2011-09-19 13:59:21 -07:00
Dianne Hackborn
fd10f444ad Merge "Maybe fix issue #5340190: java.lang.RuntimeException: Unable to start..." 2011-09-19 13:34:15 -07:00
Andreas Huber
9045f91304 Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams" 2011-09-19 13:28:47 -07:00
David Brown
d881458da2 Merge "Update code to use location aware isEmergencyNumber." 2011-09-19 12:26:14 -07:00
David Hu
63eb37205e Merge "Return the bundle object" 2011-09-19 12:11:11 -07:00
Fabrice Di Meglio
2ca4e9bac2 Merge "Fix potential leak in TextLayouCache" 2011-09-19 11:41:01 -07:00
Fabrice Di Meglio
c49d36adf8 Merge "Make TextLayoutCache no more dependent on ICU" 2011-09-19 11:40:51 -07:00
John Reck
fdade31e81 Merge "Bringing back the 'cache" 2011-09-19 11:07:28 -07:00
Gilles Debunne
4ff0e2d7f6 Merge "Bug 5290461: change voice IME underline span color" 2011-09-19 10:50:16 -07:00
Fred Quintana
143945769f am 79a33ad4: Merge "Continuation of the unified account chooser flow." into ics-factoryrom
* commit '79a33ad49e8dd54f36ea7ea5f1a275bf38daf5e8':
  Continuation of the unified account chooser flow.
2011-09-19 10:46:03 -07:00
Fred Quintana
ba70e33636 Merge "Continuation of the unified account chooser flow." into ics-factoryrom 2011-09-19 10:43:59 -07:00
Dianne Hackborn
48028211c6 Merge "Fix issue #5260129: Suggestion strip in Talk app not showing all the time" 2011-09-19 10:42:52 -07:00
Michael Jurka
83cd0e038e am b0a1f197: Merge "Added "No recent apps" message on phones" into ics-factoryrom
* commit 'b0a1f197303d520d788ba11fcb0ac56f3a3c8604':
  Added "No recent apps" message on phones
2011-09-19 10:34:39 -07:00
Michael Jurka
9e77281add Merge "Added "No recent apps" message on phones" into ics-factoryrom 2011-09-19 10:33:08 -07:00
Philip Milne
d89fab280d Merge "Fix for http://b/issue?id=5297155" 2011-09-19 10:18:36 -07:00
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