42214 Commits

Author SHA1 Message Date
Eric Fischer
0e77f6dfcb Import revised translations. DO NOT MERGE
Change-Id: I385b9dbf5908ad7030263bc586fba2ebdfe7cf85
2011-01-28 14:54:54 -08:00
Brian Muramatsu
910be3e855 am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
  Fix TextUtils#commaEllipsize
2011-01-28 14:53:07 -08:00
Brian Muramatsu
9eaefb8213 Merge "Fix TextUtils#commaEllipsize" into honeycomb 2011-01-28 14:51:10 -08:00
Romain Guy
571a2c971b am b0c939ad: Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb
* commit 'b0c939adfa339c5cbb7f458072119269368b3ba5':
  Prevent crash when detaching a SurfaceView. Bug #3400461
2011-01-28 14:20:01 -08:00
Romain Guy
b0c939adfa Merge "Prevent crash when detaching a SurfaceView. Bug #3400461" into honeycomb 2011-01-28 14:17:45 -08:00
Jamie Gennis
a461269d45 am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
* commit '2a8f8d57d23a171eaa367faa143f45fdd2f9cc1c':
  Quiet the SurfaceFlingerClient dequeueBuffer error.
2011-01-28 14:15:44 -08:00
Jamie Gennis
2a8f8d57d2 Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb 2011-01-28 14:12:57 -08:00
Dianne Hackborn
1ec7e20237 Fix issue #3403539: WordPress crashes on Honeycomb
Change-Id: Ia86e26b5bd266d8e3362a04e412a58b98a062d5f
2011-01-28 14:11:17 -08:00
Gilles Debunne
06cedc1c4a am d11f5d2c: Merge "Fix for TextView\'s error popup behavior when using soft keyboard." into honeycomb
* commit 'd11f5d2c5e41b4f2f5bda5ecca793efd2ab2300b':
  Fix for TextView's error popup behavior when using soft keyboard.
2011-01-28 14:10:08 -08:00
Gilles Debunne
d11f5d2c5e Merge "Fix for TextView's error popup behavior when using soft keyboard." into honeycomb 2011-01-28 14:07:12 -08:00
Adam Powell
406de58e48 am 6b2fda9f: Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
* commit '6b2fda9f4bcc5c35f605876a5c9da9b226196f5e':
  Fix bug 3399992 - Make ActionBar menu text styleable
2011-01-28 14:01:06 -08:00
Adam Powell
6b2fda9f4b Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb 2011-01-28 13:58:28 -08:00
Joe Onorato
d6874a105e am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
  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:43:22 -08:00
Joe Onorato
b940659f41 am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
* commit '94eb3d0f7e77eb94c9fee8523c013fbc0f9032c4':
  Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:43:17 -08:00
Adam Powell
55f3af27ed Fix bug 3399992 - Make ActionBar menu text styleable
Change-Id: Ic67d167c024332575ca3b79725f012a919146286
2011-01-28 13:42:04 -08:00
Joe Onorato
cfd0bafdeb 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
94eb3d0f7e 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
Daniel Sandler
ca05585f04 Correct font size for notifications & control panel.
Bug: 3388577
Bug: 3394785
2011-01-28 16:07:25 -05:00
Dianne Hackborn
8691b7243d am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
2011-01-28 12:46:51 -08:00
Dianne Hackborn
10e4148b62 Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb 2011-01-28 12:44:52 -08:00
Xavier Ducrohet
412e6f7e29 am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
* commit '361d614822fcda456ba80f166e5d97447adb7e79':
  LayoutLib: Update with the new resource map APIs.
2011-01-28 12:40:30 -08:00
Xavier Ducrohet
361d614822 Merge "LayoutLib: Update with the new resource map APIs." into honeycomb 2011-01-28 12:38:40 -08:00
Dianne Hackborn
420829ef78 Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it.  Add a hack for
the framework to insert its own private factory.

Also fix a deadlock in the system process.

Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
2011-01-28 12:21:54 -08:00
Daniel Sandler
9bd1d3204f am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
* commit 'f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
  Fix overlapping app icon & info in notifications with large icons.
2011-01-28 12:20:11 -08:00
Daniel Sandler
f0ca959b02 Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb 2011-01-28 12:18:11 -08:00
Jamie Gennis
6913062faa 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
30a85ec7e8 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
2011-01-28 12:00:51 -08:00
Dirk Dougherty
fa809dba8e Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Daniel Sandler
db173394aa Fix overlapping app icon & info in notifications with large icons.
Bug: 3398728
Bug: 3394785
Change-Id: I50f065d482815612b2b187f1bc4360489d7455e6
2011-01-28 14:55:42 -05:00
Andreas Huber
35a1f77175 am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb
* commit '79c4648597dab2b7786c8f067896ab66abe190de':
  Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
2011-01-28 11:51:16 -08:00
Andreas Huber
79c4648597 Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"" into honeycomb 2011-01-28 11:49:03 -08:00
Xavier Ducrohet
35ea7cd4c0 LayoutLib: Update with the new resource map APIs.
Change-Id: I30d83c2bb4569513f4f5e22670cffe938706f105
2011-01-28 11:44:21 -08:00
Romain Guy
01d5edc49a Prevent crash when detaching a SurfaceView.
Bug #3400461

Change-Id: I837d9d47b12bc5a8798b6dbb720de43b7539c3bc
2011-01-28 11:28:53 -08:00
Daniel Sandler
bcb14a2035 am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb
* commit '2ded7ef444d4e089e0ce4874c791f19ec198fc36':
  Allow taps to once again penetrate the darkness.
2011-01-28 11:23:47 -08:00
Daniel Sandler
2ded7ef444 Merge "Allow taps to once again penetrate the darkness." into honeycomb 2011-01-28 11:21:27 -08:00
Gilles Debunne
3b1561a18c am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb
* commit 'e1df07fc5a88da0242a6ade054423ec464c5318f':
  Fix for an IOOBoundsException in Paint.
2011-01-28 11:02:21 -08:00
Gilles Debunne
e1df07fc5a Merge "Fix for an IOOBoundsException in Paint." into honeycomb 2011-01-28 10:58:53 -08:00
Jamie Gennis
c49283e7aa am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
* commit '3c0f91b0e1312287a271ba890d52cdb8bb75e52d':
  Add docs about threading to SurfaceTexture.
2011-01-28 10:44:44 -08:00
Jamie Gennis
3c0f91b0e1 Merge "Add docs about threading to SurfaceTexture." into honeycomb 2011-01-28 10:42:53 -08:00
Andreas Huber
70888c00a0 am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
2011-01-28 10:42:10 -08:00
Leon Scroggins
f53e31551a am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
* commit 'e891a115a01d377dc17c0dd658ba23fb5d033e23':
  Only send a direction key if we are not in touch mode.
2011-01-28 10:34:14 -08:00
Leon Scroggins
e891a115a0 Merge "Only send a direction key if we are not in touch mode." into honeycomb 2011-01-28 10:32:35 -08:00
Andreas Huber
d916339e2f Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1.

Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719
related-to-bug: 3392386
2011-01-28 10:30:56 -08:00
Chet Haase
97908283c8 am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
* commit 'fe38b7b79325782f682365ec9d1b8fe2932eec78':
  Fix artifact with clipped webview content
2011-01-28 10:18:39 -08:00
Chet Haase
fe38b7b793 Merge "Fix artifact with clipped webview content" into honeycomb 2011-01-28 10:16:54 -08:00
Andreas Huber
b6c2e2b46c DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
2011-01-28 09:58:11 -08:00
Robert Greenwalt
f7784876ed am b8498f1d: Merge "Fix data network type notifications." into honeycomb
* commit 'b8498f1dcf0b4e866c940da482930789cd6554c5':
  Fix data network type notifications.
2011-01-28 09:51:34 -08:00
Robert Greenwalt
b8498f1dcf Merge "Fix data network type notifications." into honeycomb 2011-01-28 09:48:31 -08:00
Andreas Huber
970436ee42 am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
* commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4':
  More robust parsing of NPT time ranges in RTSP.
2011-01-28 09:41:11 -08:00
Andreas Huber
b0eb8bb76c Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb 2011-01-28 09:38:50 -08:00