Commit Graph

27006 Commits

Author SHA1 Message Date
Justin Ho
31db9b8551 Merge "Correct font size for notifications & control panel." into honeycomb 2011-01-28 15:02:55 -08:00
Brian Muramatsu
12ef5792f0 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Romain Guy
3845b92378 Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Jamie Gennis
155c93ad47 Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 2011-01-28 14:12:57 -08:00
Eric Fischer
bb3356d637 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Gilles Debunne
2948bb3f5f Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb 2011-01-28 14:07:12 -08:00
Adam Powell
7791f904da Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
ee37f4d420 Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:40:45 -08:00
Joe Onorato
311e33ddd1 Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb 2011-01-28 13:40:28 -08:00
Dianne Hackborn
e40389171f Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 2011-01-28 12:44:52 -08:00
Xavier Ducrohet
2b63b8306b Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 2011-01-28 12:38:40 -08:00
Daniel Sandler
ea0c499624 Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 2011-01-28 12:18:11 -08:00
Jamie Gennis
749172269a Quiet the SurfaceFlingerClient dequeueBuffer error.
This is a temporary WAR for the case where dequeueBuffer is called when
all the buffers owned by a SurfaceTexture are not available - either
they're the current texture buffer or the next one.  Currently, an error
is returned in that case, and this change just prevents that error from
being logged.  In the future this will be fixed to not return an error
in that case.

Bug: 3356050
Change-Id: Ic6cc304881a63ce134cfd0bcb4265e3e3fa94b6a
2011-01-28 12:08:18 -08:00
Dirk Dougherty
11057a96fd Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Andreas Huber
b7ee5074dd Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb 2011-01-28 11:49:03 -08:00
Daniel Sandler
fab00f6920 Merge "Allow taps to once again penetrate the darkness." into honeycomb 2011-01-28 11:21:27 -08:00
Gilles Debunne
288e4320da Merge "Fix for an IOOBoundsException in Paint." into honeycomb 2011-01-28 10:58:53 -08:00
Jamie Gennis
732c3a087c Merge "Add docs about threading to SurfaceTexture." into honeycomb 2011-01-28 10:42:53 -08:00
Leon Scroggins
d554549b27 Merge "Only send a direction key if we are not in touch mode." into honeycomb 2011-01-28 10:32:35 -08:00
Chet Haase
dc5f2c714f Merge "Fix artifact with clipped webview content" into honeycomb 2011-01-28 10:16:54 -08:00
Robert Greenwalt
8e70e7cd29 Merge "Fix data network type notifications." into honeycomb 2011-01-28 09:48:31 -08:00
Andreas Huber
2f313aa982 Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb 2011-01-28 09:38:50 -08:00
Ben Murdoch
4613570b51 Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb 2011-01-28 02:27:38 -08:00
Dianne Hackborn
a2ba76d444 Merge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb 2011-01-27 22:48:58 -08:00
Dianne Hackborn
a3980da2d0 Merge "Maybe fix issue #3358322: Status and nav bar died while watching youtube" into honeycomb 2011-01-27 22:47:50 -08:00
Dianne Hackborn
0891204682 Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb 2011-01-27 22:46:44 -08:00
Romain Guy
f930d5de48 Merge "Add more debug info for profiling." into honeycomb 2011-01-27 22:30:57 -08:00
Dianne Hackborn
11e0746577 Fix issue #3392073: At times soft keyboard comes up in...
...gallery while attaching picture to gmail message

In various places we could block switching the IME target incorrectly.

Change-Id: I7e647fb35f4ea6f2e39eb7efd911420ea9ee64fa
2011-01-27 21:56:33 -08:00
Jason Sams
61486c0980 Merge "Fix another barrier bug 3333866 Atomically update put." into honeycomb 2011-01-27 21:24:00 -08:00
Eric Laurent
3e04730f32 am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerbread
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
  do not merge - Fix issue 3371096.
2011-01-27 21:21:04 -08:00
Adam Cohen
460529bb93 Merge "Fixing static StackView scenario (Issue: 3399844)" into honeycomb 2011-01-27 20:04:21 -08:00
satok
540494935d Merge "Update InputMethodPanel when locale was changed." into honeycomb 2011-01-27 20:00:43 -08:00
Dianne Hackborn
777b260dfc am 11576102: (-s ours) Fix issue #3373438: Update GBMR versions
* commit '11576102a9794ef964a08bc372dc09803f58997a':
  Fix issue #3373438: Update GBMR versions
2011-01-27 19:57:58 -08:00
Dave Sparks
3ce5ba094f am 65d39eeb: (-s ours) Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '65d39eeb9b032e5507a01daa25afff62b29bffe4':
  DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
2011-01-27 19:49:59 -08:00
Mathias Agopian
3d24c3d2c8 am 822d4ce6: Merge "fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
* commit '822d4ce61687d386f9630b33113c6193257d6878':
  fix [3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly
2011-01-27 19:49:40 -08:00
Jeff Brown
ea6231e8cd am d0725eef: (-s ours) Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
* commit 'd0725eef671c059b8e26d900fee655747f506dbe':
  Never drag scroll views with no children. (DO NOT MERGE)
2011-01-27 19:41:07 -08:00
Stephen Hines
69f5a32563 Merge "Correctly free resouces bound to scripts when the scripts are deleted." into honeycomb 2011-01-27 19:40:24 -08:00
Justin Ho
362c51c8c1 Merge "Attenuate notification icons in the system bar." into honeycomb 2011-01-27 19:32:13 -08:00
Mathias Agopian
cfa63d6fce am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
* commit 'a0bafb471385767f7c9c91efe7fd828b069b2e97':
  Use EGL_NATIVE_VISUAL_ID to select EGLConfig
2011-01-27 18:39:21 -08:00
Justin Ho
9fbe882c5b Merge "Updated data and wifi indicators, updated GPS" into honeycomb 2011-01-27 18:39:19 -08:00
Andreas Huber
e4b3b96558 am e9a00235: (-s ours) Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit 'e9a00235c102d198a702bc665b2ea5b5e8c4bc07':
  DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
2011-01-27 18:38:21 -08:00
Eric Laurent
f8edaa87a6 Merge "Fix issue 2988031." into gingerbread 2011-01-27 18:37:04 -08:00
Nick Pelly
7d4badf432 resolved conflicts for merge of b7d6ffd7 to honeycomb-merge
Change-Id: If5553e0b51513687c4012600d92323617190fb6c
2011-01-27 18:35:19 -08:00
Nick Pelly
9cde31fedc am 50d0bcb4: Merge "Support for TagLostException (API)." into gingerbread
* commit '50d0bcb45beb30746271b620ab23ad4d69fd9d5b':
  Support for TagLostException (API).
2011-01-27 18:29:13 -08:00
Brad Fitzpatrick
1249907bba am 597fa828: Merge "Watchdog can get deadlocked on activity manager" into gingerbread
* commit '597fa828fa2b3cba053f0afeeac877b1ee2d24b7':
  Watchdog can get deadlocked on activity manager
2011-01-27 18:28:54 -08:00
Nick Pelly
941e9d530e am b735aa0b: Merge "Fix javadoc which broke build." into gingerbread
* commit 'b735aa0b6fabb72097191923d8787b43fa52531e':
  Fix javadoc which broke build.
2011-01-27 18:28:25 -08:00
Eric Laurent
5e03a5a078 resolved conflicts for merge of 00118a48 to honeycomb-merge
Change-Id: I27d24fb00e36bdaadbdf646bb8bf7b5639556369
2011-01-27 18:25:32 -08:00
Jim Miller
ddccfdc3d4 Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 2011-01-27 18:22:14 -08:00
Justin Ho
dbdda0ccb7 Merge "Updated tether icons" into honeycomb 2011-01-27 18:21:54 -08:00
Svetoslav Ganov
c70aa75c83 Merge "Accessibility support to NumberPicker, DatePicker, and TimePicker" into honeycomb 2011-01-27 18:16:27 -08:00