Joe Onorato
bafa3a31f5
am d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
...
* commit 'd6874a105ee584b1dc60aae2f2af7c78ee875114':
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:45:51 -08:00
Joe Onorato
8b16ebd0e8
am b940659f: am 94eb3d0f: Merge "Plumb whether an input view is actually visible or not through from the IME to the status bar." into honeycomb
...
* commit 'b940659f415d536966f1bb8af4d5281efa3a7f7a':
Plumb whether an input view is actually visible or not through from the IME to the status bar.
2011-01-28 13:45:42 -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
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
Dianne Hackborn
f2a8b3c450
am 8691b724: am 10e4148b: Merge "Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader" into honeycomb
...
* commit '8691b7243d40d5ef0ab94b8d5f204635d36bf1c4':
Fix issue #3291173 : Problem report for NewsRoom - RSS News Reader
2011-01-28 12:48:15 -08: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
2c06d4e786
am 412e6f7e: am 361d6148: Merge "LayoutLib: Update with the new resource map APIs." into honeycomb
...
* commit '412e6f7e294aa56a2c4532155cde6fa9963dbbf0':
LayoutLib: Update with the new resource map APIs.
2011-01-28 12:44:01 -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
Daniel Sandler
e42d0dd741
am 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb
...
* commit '9bd1d3204f4048b902d0fdf0ea0809f29eddeafd':
Fix overlapping app icon & info in notifications with large icons.
2011-01-28 12:22:38 -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
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
f51c35e45f
am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb
...
* commit '35a1f771759459fc6c9b355d548c5b97cd50e110':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
2011-01-28 11:53:50 -08: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
Daniel Sandler
b50f64f5c5
am bcb14a20: am 2ded7ef4: Merge "Allow taps to once again penetrate the darkness." into honeycomb
...
* commit 'bcb14a203561c3782ebd6515650cc7001318efb6':
Allow taps to once again penetrate the darkness.
2011-01-28 11:26:05 -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
722dbd34e5
am 3b1561a1: am e1df07fc: Merge "Fix for an IOOBoundsException in Paint." into honeycomb
...
* commit '3b1561a18c466c23e9c5a3c3297bfc97e881c829':
Fix for an IOOBoundsException in Paint.
2011-01-28 11:04:36 -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
5c8a27d8bb
am c49283e7: am 3c0f91b0: Merge "Add docs about threading to SurfaceTexture." into honeycomb
...
* commit 'c49283e7aae0f4f00dc8337d2b98addc01abdd8f':
Add docs about threading to SurfaceTexture.
2011-01-28 10:46:56 -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
Leon Scroggins
ef6af6f793
am f53e3155: am e891a115: Merge "Only send a direction key if we are not in touch mode." into honeycomb
...
* commit 'f53e31551aeca325216e72e76d616f06c1fc14f9':
Only send a direction key if we are not in touch mode.
2011-01-28 10:36:34 -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
ecede3914f
am 97908283: am fe38b7b7: Merge "Fix artifact with clipped webview content" into honeycomb
...
* commit '97908283c8c7f162bf584e2ad769dc2f6b5061aa':
Fix artifact with clipped webview content
2011-01-28 10:20:53 -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
Robert Greenwalt
473df1cd24
am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb
...
* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
Fix data network type notifications.
2011-01-28 09:54:04 -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
12a8c3959f
am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into honeycomb
...
* commit '970436ee42bad03940a73666f8150a28c5789713':
More robust parsing of NPT time ranges in RTSP.
2011-01-28 09:43:37 -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
Andreas Huber
a2edd7d8d1
More robust parsing of NPT time ranges in RTSP.
...
Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3
related-to-bug: 3217210
2011-01-28 09:36:38 -08:00
Justin Ho
531b7d1072
am e5da4b74: am 47db84cc: New stat_notify icons
...
* commit 'e5da4b74d4f4ba5fea63c4608b702d89f433b94c':
New stat_notify icons
2011-01-28 09:28:17 -08:00
Justin Ho
e5da4b74d4
am 47db84cc: New stat_notify icons
...
* commit '47db84cca867c5efdd4760cdf451a9c402097668':
New stat_notify icons
2011-01-28 09:25:32 -08:00
Robert Greenwalt
e4f77dc592
am 07a8778b: Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit '07a8778b560ce8d46bcf5aad012be575f3a90500':
Update networktype before sending state change.
2011-01-28 09:22:01 -08:00
Robert Greenwalt
07a8778b56
Merge "resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-28 09:08:00 -08:00
Justin Ho
47db84cca8
New stat_notify icons
...
Change-Id: Ida4001e66fa0d6689c623286c27e85b4a65afd29
2011-01-28 09:07:59 -08:00
Robert Greenwalt
3bc074d1f0
resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp
...
Change-Id: Ib9d24c211461329955288180978a7c5d383bba75
2011-01-28 09:06:30 -08:00