drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,056 Commits 1 Branch 0 Tags
Commit Graph

62056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Quintana
f3f7d65b65 am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
  By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
 2011-12-05 16:47:06 -08:00
Fred Quintana
b5f2dfbc22 Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1 2011-12-05 16:45:29 -08:00
Michael Kolb
cda010d556 am 3124e6f9: Merge "Remove debug log messages" into ics-mr1 
* commit '3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
  Remove debug log messages
 2011-12-05 16:13:49 -08:00
Michael Kolb
3124e6f9e9 Merge "Remove debug log messages" into ics-mr1 2011-12-05 16:12:35 -08:00
Xia Wang
96f660f4a8 am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 
* commit 'e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
  Add extra 2 minute for wifi to shutdown
 2011-12-05 15:55:27 -08:00
Xia Wang
e63d67eff7 Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1 2011-12-05 15:52:34 -08:00
Fred Quintana
33e4469417 By default ICS allows two syncs to run in parallel. Make it only 
do one at a time for devices that don't have much RAM as
defined by the call ActivityManager.isLargeRAM()

Bug: 5713224
Change-Id: Ic8c42103f4031e1d7b1db797edcbbd7f7bac1387
 2011-12-05 15:44:34 -08:00
Svetoslav Ganov
96de4c3bef 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:31 -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
Michael Kolb
e4e5fef75e Remove debug log messages 
Bug: 5713163

Change-Id: Id8d9845f6ecb7dd90ae4cf42bc82d39a148a5700
 2011-12-05 14:55:02 -08:00
Irfan Sheriff
f81674ca52 am 6b66e9e4: Switch to notifications for walled garden 
* commit '6b66e9e4c95b1c866ea63a0122fc199994fd7053':
  Switch to notifications for walled garden
 2011-12-05 14:22:03 -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
9467d0bde1 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:24 -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
ab50285ae4 am 845b3efc: Merge "Add missing locale date format files." into ics-mr1 
* commit '845b3efc9935e66b718d8e9a56435bf039f97633':
  Add missing locale date format files.
 2011-12-05 12:28:06 -08:00
Eric Fischer
845b3efc99 Merge "Add missing locale date format files." into ics-mr1 2011-12-05 12:25:58 -08:00
Xia Wang
10a3e8fae8 Add extra 2 minute for wifi to shutdown 
Change-Id: I3cf2fbf5de8b96b75d5e460e4ad822a1947ff6e7
 2011-12-05 12:22:47 -08:00
Eric Fischer
db04b88cc8 Add missing locale date format files. 
Change-Id: I4533c8aff25ee9f6a37a18005ea1341c99c4e696
 2011-12-05 12:20:01 -08:00
Andreas Huber
07bacabe74 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:03:41 -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
803caff1dc 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:51 -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
32e914fc03 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:21 -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
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
a91e54fed6 am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition
 2011-12-02 18:33:14 -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
00f1ac8001 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:04 -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
0c7e894e79 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:07 -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
6d3e51d4c4 am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
 2011-12-02 14:49:19 -08:00
John Reck
43bc6b094e Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Mike Lockwood
9f3f3c2fbe 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:17 -08:00
Mike Lockwood
7bbc3c4bbe 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:15 -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
939a3dd4e7 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:48:35 -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
54cf27d7bb 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:22 -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
04bd27ebed 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:36 -08:00