Svetoslav Ganov
47e6347567
am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
...
* commit 'da926cf284ff5f5ccf91dec088ff64d442cee25c':
TalkBack does not announce properly the buttons of the PIN lock.
2011-12-05 15:04:28 -08:00
Svetoslav Ganov
da926cf284
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
2011-12-05 15:03:13 -08:00
Irfan Sheriff
f8b8326982
am 6b66e9e4: Switch to notifications for walled garden
...
* commit '6b66e9e4c95b1c866ea63a0122fc199994fd7053':
Switch to notifications for walled garden
2011-12-05 14:21:58 -08:00
Svetoslav Ganov
a10be93aaa
TalkBack does not announce properly the buttons of the PIN lock.
...
The KeyBoardView shown by the lock screen is not marked as clickable even
though it handles clicks. TalkBack uses the clickability as a clue of what
to speak.
bug:5713102
Change-Id: I0733e30619e6045ce3f78e1499db65f4dc5bc388
2011-12-05 14:16:30 -08:00
Irfan Sheriff
6b66e9e4c9
Switch to notifications for walled garden
...
Also, switches the URL for browser to the actual URL used for checking
walled garden
Bug: 5398921
Change-Id: Ie4d4b1d47f4151d0f85975b10190bdcf5f2e7a57
2011-12-05 14:12:06 -08:00
Peter Ng
b113ad6be8
am 74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
...
* commit '74b496dd8aab7e29bcba0c6502f773555c4ce29f':
Numberpicker section divider is now 2dp thick
2011-12-05 12:36:28 -08:00
Peter Ng
74b496dd8a
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
2011-12-05 12:34:53 -08:00
Eric Fischer
20e1dc5cb3
am 845b3efc: Merge "Add missing locale date format files." into ics-mr1
...
* commit '845b3efc9935e66b718d8e9a56435bf039f97633':
Add missing locale date format files.
2011-12-05 12:27:16 -08:00
Eric Fischer
845b3efc99
Merge "Add missing locale date format files." into ics-mr1
2011-12-05 12:25:58 -08:00
Eric Fischer
db04b88cc8
Add missing locale date format files.
...
Change-Id: I4533c8aff25ee9f6a37a18005ea1341c99c4e696
2011-12-05 12:20:01 -08:00
Andreas Huber
384612d13e
am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
...
* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
2011-12-05 12:02:53 -08:00
Andreas Huber
f2e1249846
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
2011-12-05 12:01:26 -08:00
Andreas Huber
b8e651a675
Properly identify how much metadata we need to cache in order to instantiate
...
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
2011-12-05 11:34:43 -08:00
Peter Ng
cbdff7a7a5
Numberpicker section divider is now 2dp thick
...
Change-Id: I614c7316e43c23650166971662ed7dfd847ddaa8
2011-12-05 11:16:27 -08:00
Dianne Hackborn
3e9df5baf9
am 003c15d7: Merge "Fix issue #5614559 : Registering surface error in..." into ics-mr1
...
* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
Fix issue #5614559 : Registering surface error in...
2011-12-05 10:42:33 -08:00
Dianne Hackborn
003c15d72c
Merge "Fix issue #5614559 : Registering surface error in..." into ics-mr1
2011-12-05 10:40:59 -08:00
Michael Kolb
068f8e7cda
am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
...
* commit '277cbe5a951840558166020568fb1510285e2594':
set System UI visibility based on MediaController state
2011-12-05 09:26:13 -08:00
Michael Kolb
277cbe5a95
Merge "set System UI visibility based on MediaController state" into ics-mr1
2011-12-05 09:24:25 -08:00
Joe Onorato
c286560534
Use the new get/putFlattenable methods on RpcData.
...
They handle null correctly.
Change-Id: I8eebf43e1791ea0f99f3d4ee1beb74aa4c977115
2011-12-04 21:13:23 -08:00
Dianne Hackborn
61566cc193
Fix issue #5614559 : Registering surface error in...
...
...Background Replacement on Stingray
This is how I should have done it in the first place. We get the
new surface from the window manager, and then just copy it in to
the constant Surface object we have for the holder.
Change-Id: I537a9e413829a18f689dfb46687014676b27156e
2011-12-03 11:16:49 -08:00
Jesse Hall
18bd6bdbf0
am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
...
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
SurfaceFlinger: fix layer removal race condition
2011-12-02 18:32:22 -08:00
Jesse Hall
f57c138886
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
2011-12-02 18:31:03 -08:00
Robert Greenwalt
9ef703692a
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
...
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
Be careful sharing connections when dun is in play
2011-12-02 16:54:27 -08:00
Robert Greenwalt
2a7b5ab16a
Merge "Be careful sharing connections when dun is in play" into ics-mr1
2011-12-02 16:52:29 -08:00
Robert Greenwalt
7cb88dda5b
Be careful sharing connections when dun is in play
...
A request for a DUN connection should only use the carriers requested dun connection. Don't
share another connection unless it matches the carriers settings.
bug:5701374
Change-Id: I75a65fcfce1b218bd9ca4ce2ab85cbe850813321
2011-12-02 16:42:18 -08:00
Michael Kolb
c07b678522
set System UI visibility based on MediaController state
...
Bug: 5494143
still doesn't remove the buttons in dimmed state,
but at least dims them correctly
Change-Id: Idcfc10616d31f6ccf8cd84b706a17d048bf505a1
2011-12-02 16:12:02 -08:00
Gilles Debunne
e64f4abb29
am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
...
* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
Handle animations in Views' rectangle clipping methods.
2011-12-02 15:31:17 -08:00
Gilles Debunne
2f1e1e4ab9
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
2011-12-02 15:28:56 -08:00
John Reck
33caf2bd28
am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
...
* commit '43bc6b094edda6baa8123115a33afaf454525376':
Fix updateDoubleTapZoom logic
2011-12-02 14:49:22 -08:00
John Reck
43bc6b094e
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
2011-12-02 14:47:04 -08:00
Mike Lockwood
15cf022c70
am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
...
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 13:22:28 -08:00
Mike Lockwood
d562cbf6f8
am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
...
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
2011-12-02 13:22:26 -08:00
Mike Lockwood
1a3ece9f87
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
2011-12-02 13:20:49 -08:00
Mike Lockwood
7f87d9cf66
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
2011-12-02 13:20:39 -08:00
Chia-chi Yeh
cdf9e4c098
am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
...
* commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 12:49:42 -08:00
Chia-chi Yeh
25bcbbb597
am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
...
* commit '431c3e4c7e2103865a90501a552b4e5145ed3f35':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 12:46:51 -08:00
Chia-chi Yeh
431c3e4c7e
Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
2011-12-02 12:45:44 -08:00
Jesse Hall
f6544bde14
am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
...
* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
Disable GLES20Canvas on emu w/o native GL
2011-12-02 12:35:20 -08:00
Jesse Hall
6d90c1c6fe
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
2011-12-02 12:33:20 -08:00
Mike Lockwood
7944c1b19f
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
...
Bug: 5527220
Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:47 -05:00
Mike Lockwood
7a1ad63d16
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
...
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K
Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:30 -05:00
Roman Nurik
f6debe9f88
am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit '55347e65e229ed63f7e18cb5b82639174c0f54bb':
Reduce file size for ADL presentation shareable.
2011-12-02 12:01:25 -08:00
Roman Nurik
55347e65e2
am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.
2011-12-02 11:59:07 -08:00
Roman Nurik
cd0e446dc8
Merge "Reduce file size for ADL presentation shareable." into ics-mr0
2011-12-02 11:57:03 -08:00
Roman Nurik
5c8e690edf
Reduce file size for ADL presentation shareable.
...
Change-Id: I700959f3c15609c730c63d99953b890a93105cea
2011-12-02 11:41:04 -08:00
Amith Yamasani
54a7962590
am afd01086: Merge "Further volume improvements." into ics-mr1
...
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
Further volume improvements.
2011-12-02 11:23:50 -08:00
Amith Yamasani
afd0108679
Merge "Further volume improvements." into ics-mr1
2011-12-02 11:22:32 -08:00
Gilles Debunne
15daf351c4
am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1
...
* commit 'f96aa3b197b96f9cb276485420c09a7b36606599':
(de)activating spell check taken into account immediately
2011-12-02 10:47:18 -08:00
Gilles Debunne
f96aa3b197
Merge "(de)activating spell check taken into account immediately" into ics-mr1
2011-12-02 10:45:25 -08:00
Jesse Hall
8a7c940eff
SurfaceFlinger: fix layer removal race condition
...
Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.
This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.
Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
2011-12-02 10:03:25 -08:00