Justin Ho
e46b080102
am 20af1c57: Merge "Correct font size for notifications & control panel." into honeycomb
...
* commit '20af1c57de9651b93a35b67418263b88bc83f3e4':
Correct font size for notifications & control panel.
2011-01-28 15:05:07 -08:00
Justin Ho
31db9b8551
Merge "Correct font size for notifications & control panel." into honeycomb
2011-01-28 15:02:55 -08:00
Brian Muramatsu
1a86374dc3
am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb
...
* commit '9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0':
Fix TextUtils#commaEllipsize
2011-01-28 14:53:07 -08:00
Brian Muramatsu
12ef5792f0
Merge "Fix TextUtils#commaEllipsize" into honeycomb
2011-01-28 14:51:10 -08:00
Romain Guy
719eda08be
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
3845b92378
Merge "Prevent crash when detaching a SurfaceView. Bug #3400461 " into honeycomb
2011-01-28 14:17:45 -08:00
Jamie Gennis
e8c431b142
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
155c93ad47
Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb
2011-01-28 14:12:57 -08:00
Gilles Debunne
3546e78bd8
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
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
304d99871f
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
7791f904da
Merge "Fix bug 3399992 - Make ActionBar menu text styleable" into honeycomb
2011-01-28 13:58:28 -08:00
Joe Onorato
d24a7df9f0
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
0a72c43a42
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
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
065b683e26
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
e40389171f
Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
2011-01-28 12:44:52 -08:00
Xavier Ducrohet
57be3f1d31
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
2b63b8306b
Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
2011-01-28 12:38:40 -08:00
Daniel Sandler
ea28d411fd
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
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
Andreas Huber
60c2d783a4
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
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
d01f5e3121
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
fab00f6920
Merge "Allow taps to once again penetrate the darkness." into honeycomb
2011-01-28 11:21:27 -08:00
Gilles Debunne
7d1b9518b0
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
288e4320da
Merge "Fix for an IOOBoundsException in Paint." into honeycomb
2011-01-28 10:58:53 -08:00
Jamie Gennis
b9470e7cf6
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
732c3a087c
Merge "Add docs about threading to SurfaceTexture." into honeycomb
2011-01-28 10:42:53 -08:00
Leon Scroggins
58535fe2fc
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
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
f24293bd8a
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
dc5f2c714f
Merge "Fix artifact with clipped webview content" into honeycomb
2011-01-28 10:16:54 -08:00
Robert Greenwalt
3e5aebe951
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
8e70e7cd29
Merge "Fix data network type notifications." into honeycomb
2011-01-28 09:48:31 -08:00
Andreas Huber
1193e85b4c
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
2f313aa982
Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
2011-01-28 09:38:50 -08:00
Justin Ho
7a8c55c889
am 47db84cc: New stat_notify icons
...
* commit '47db84cca867c5efdd4760cdf451a9c402097668':
New stat_notify icons
2011-01-28 09:25:32 -08:00
Robert Greenwalt
2b1e607682
Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-28 09:08:00 -08:00
Robert Greenwalt
d9187088f6
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
...
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
2011-01-28 09:06:30 -08:00
Ben Murdoch
5803c2a5df
am c38b7c82: Merge "Implement the double tap to zoom animation with HW accleration." into honeycomb
...
* commit 'c38b7c820af52c4d5f6f51c750136d18d9897e5e':
Implement the double tap to zoom animation with HW accleration.
2011-01-28 02:35:22 -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
311559851f
am 256a09b2: Merge "Fix issue #3392073 : At times soft keyboard comes up in..." into honeycomb
...
* commit '256a09b2fa5cc06775818428de771c7957403452':
Fix issue #3392073 : At times soft keyboard comes up in...
2011-01-27 22:50:56 -08:00
Dianne Hackborn
d7f4f7c167
am d23316bc: Merge "Maybe fix issue #3358322 : Status and nav bar died while watching youtube" into honeycomb
...
* commit 'd23316bc8b49f269e5adcc91eae5698549faa0a3':
Maybe fix issue #3358322 : Status and nav bar died while watching youtube
2011-01-27 22:50:52 -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
16cda1f7a3
am c8c3021a: Merge "Fix issue #3398767 : Need translucent holo theme" into honeycomb
...
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
Fix issue #3398767 : Need translucent holo theme
2011-01-27 22:48:32 -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