John Grossman
aa4aacad9f
am 03f2fb3c: (-s ours) AAH_RX: Add the ability to control volume and stream type.
...
* commit '03f2fb3cb9b045545d9a9abbaa37cf98a25cb67e':
AAH_RX: Add the ability to control volume and stream type.
2012-05-24 18:27:19 -07:00
John Reck
fcf4c34545
am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
...
* commit '731327a93a9e5f1550effaf48fb944d8cae507d5':
Support skipping a touch stream due to lack of handlers
2012-05-24 18:18:07 -07:00
John Reck
731327a93a
am f7388102: Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
...
* commit 'f738810247b887082dbf4ca3a867f8d9e1955001':
Support skipping a touch stream due to lack of handlers
2012-05-24 18:13:52 -07:00
John Reck
f738810247
Merge "Support skipping a touch stream due to lack of handlers" into jb-dev
2012-05-24 18:11:36 -07:00
Jim Miller
9a1a3ab84e
am 4414bdef: am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
...
* commit '4414bdefe1ac1559f2c4d2658a28ed80abc84482':
Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:59:54 -07:00
Craig Mautner
609c6e331b
am 013772f2: am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev
...
* commit '013772f2d6f0a0aec96b90a768ff198a27289eac':
Redraw all windows earlier in power on sequence.
2012-05-24 17:56:30 -07:00
Jim Miller
4414bdefe1
am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
...
* commit '73bde11e624c44620819e9c93a61ca6be6e96997':
Fix 6547012: ignore events outside the home/back/recent navigation area
2012-05-24 17:56:02 -07:00
Craig Mautner
013772f2d6
am 2af7b915: Merge "Redraw all windows earlier in power on sequence." into jb-dev
...
* commit '2af7b9151f8df3581e38847ac711185426df5dea':
Redraw all windows earlier in power on sequence.
2012-05-24 17:52:23 -07:00
Jim Miller
73bde11e62
Merge "Fix 6547012: ignore events outside the home/back/recent navigation area" into jb-dev
2012-05-24 17:51:10 -07:00
Craig Mautner
2af7b9151f
Merge "Redraw all windows earlier in power on sequence." into jb-dev
2012-05-24 17:48:44 -07:00
John Grossman
03f2fb3cb9
AAH_RX: Add the ability to control volume and stream type.
...
DO NOT MERGE
Change the AAH_RX player so that it implements MediaPlayerHWInterface
(instead of just MediaPlayerInterface) so the app level can control
the rendering volume of individual RX player instances as well as the
stream type of the audio tracks created by the RX player.
Change-Id: Ieff1ea774f7981227546744883ee4b4e87a2cd2a
Signed-off-by: John Grossman <johngro@google.com>
2012-05-24 17:48:17 -07:00
Jim Miller
960892c0af
Fix 6547012: ignore events outside the home/back/recent navigation area
...
This fixes the search panel to only show if touch events originate
in the home/back/recent area.
Change-Id: I370da8b5c5613b7bbab5d266ba51a61df8f3a57b
2012-05-24 17:02:31 -07:00
Wink Saville
fe002daf4a
am 039e4d3d: am 02a43d3a: Merge "Add debug for tracking down connectivity issues." into jb-dev
...
* commit '039e4d3dcc9478ac406478f061c3dacff6943321':
Add debug for tracking down connectivity issues.
2012-05-24 16:10:33 -07:00
Wink Saville
039e4d3dcc
am 02a43d3a: Merge "Add debug for tracking down connectivity issues." into jb-dev
...
* commit '02a43d3adf8a0b43503f5e266ca332fc1ba23ccc':
Add debug for tracking down connectivity issues.
2012-05-24 16:07:18 -07:00
Wink Saville
02a43d3adf
Merge "Add debug for tracking down connectivity issues." into jb-dev
2012-05-24 16:05:18 -07:00
Wink Saville
f19540a2d7
Add debug for tracking down connectivity issues.
...
bug: 6529189
Change-Id: I5dc4316ceacf48625f0839e0200b77a1e0984465
2012-05-24 15:44:01 -07:00
Craig Mautner
3d7b7d59c8
Redraw all windows earlier in power on sequence.
...
Send a message to all windows to redraw before notifying
PhoneWindowManager of screen on. This minimizes the delay in
screen update that causes the keyguard clock to display the old time
before displaying the current time.
Fixes bug 6381021.
Change-Id: Ida7071e7dac2284540f101c5d004511b52133b91
2012-05-24 15:38:54 -07:00
John Reck
c1e80a360a
Support skipping a touch stream due to lack of handlers
...
Bug: 6317798
Change-Id: Ia1652e9030e877e270326e9e8a8b040810b89f09
2012-05-24 15:31:13 -07:00
Romain Guy
98fd5a5fbc
am ed130313: am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
...
* commit 'ed1303132912f0d39bcd008c3efbc0422d7433fc':
Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:33:53 -07:00
Romain Guy
ed13031329
am 94328c30: Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
...
* commit '94328c308bc8d283841ac6434d47b4c56389a388':
Clear bitmap references from display lists as early as possible Bug #6555840
2012-05-24 14:28:22 -07:00
Romain Guy
94328c308b
Merge "Clear bitmap references from display lists as early as possible Bug #6555840 " into jb-dev
2012-05-24 14:25:44 -07:00
Romain Guy
38c2ece5ce
Clear bitmap references from display lists as early as possible
...
Bug #6555840
Apps like Google+ with large bitmaps displayed in listivews could
run into memory issues because of these references.
Change-Id: I39486bda13ce00c5a3b6481139ad54547506a8b4
2012-05-24 14:20:56 -07:00
Robert Greenwalt
4dfc783beb
am 8a9d8f06: am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
...
* commit '8a9d8f068c29b8d195ffdcc250dccf7bcecd5f53':
Modify logging to debug this issue
2012-05-24 12:34:00 -07:00
Robert Greenwalt
8a9d8f068c
am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev
...
* commit '1ed1de7ab2ae03f82500dbf6272bf036d89bd0c9':
Modify logging to debug this issue
2012-05-24 12:30:20 -07:00
Robert Greenwalt
1ed1de7ab2
Merge "Modify logging to debug this issue" into jb-dev
2012-05-24 12:27:23 -07:00
Eric Laurent
aa5481214f
am dcc752a8: am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
...
* commit 'dcc752a8984361ba23da00bf2adeec4161b67af2':
AudioManager: restore setBluetoothA2dpOn() method
2012-05-24 11:47:48 -07:00
Jeff Sharkey
fe3297dd34
am a3a7bcbd: am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
...
* commit 'a3a7bcbda43ebddbf7bdd70c12258d1f1066c931':
Advise persist threshold outside NPMS lock.
2012-05-24 11:47:44 -07:00
Eric Laurent
dcc752a898
am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
...
* commit '90fb2dd6738792ebead64c5f03a4f407d36420de':
AudioManager: restore setBluetoothA2dpOn() method
2012-05-24 11:42:59 -07:00
Jeff Sharkey
a3a7bcbda4
am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev
...
* commit '6385ff511dd998f1fbb189621270e2c19577f66e':
Advise persist threshold outside NPMS lock.
2012-05-24 11:42:53 -07:00
Eric Laurent
90fb2dd673
Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev
2012-05-24 11:39:36 -07:00
Jeff Sharkey
6385ff511d
Merge "Advise persist threshold outside NPMS lock." into jb-dev
2012-05-24 11:38:12 -07:00
Fabrice Di Meglio
c30d1ad8f3
am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '07e28d1e9bd7373c83cb66d5d9e93ae9af1f090d':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 11:13:42 -07:00
George Mount
a893591ff6
am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
...
* commit '4f3136768038398e109a66d393d74858d2754a34':
Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 11:13:25 -07:00
Robert Greenwalt
5a0c320a82
Modify logging to debug this issue
...
Logging exec time on startUsingNetworkFeature as we've had some reports suggesting it's
causing ANRs.
Remove some logging from NDC so it's local log is more useful.
bug:6492166
Change-Id: I258ff6c59bff2c65935242d50496d84720c5d493
2012-05-24 10:47:10 -07:00
Fabrice Di Meglio
07e28d1e9b
am 0100625b: Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
...
* commit '0100625bb316ecbd99873b72756ffba8613c3456':
Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)
2012-05-24 10:45:54 -07:00
Fabrice Di Meglio
0100625bb3
Merge "Fix bug #6522190 MountService should respond to configuration changes ("INTERNAL STORAGE" string should be translated dynamically)" into jb-dev
2012-05-24 10:42:23 -07:00
Jeff Sharkey
e19f39b79c
Advise persist threshold outside NPMS lock.
...
Bug: 6492166
Change-Id: Ibebdc7e9b8cae27c12fd7b61b53ab60287a0364d
2012-05-24 10:21:16 -07:00
Ben Murdoch
b9fcb1334d
resolved conflicts for merge of cde7efde to master
...
Change-Id: I44433670a897c23b3bd388cbba9cfacf80e3345f
2012-05-24 18:02:56 +01:00
George Mount
4f31367680
am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
...
* commit '222f56135026627637e9db4801d6532b1ff16657':
Use setCustomSelectActionModeCallback to disallow action bar.
2012-05-24 09:56:16 -07:00
George Mount
222f561350
Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb-dev
2012-05-24 09:53:17 -07:00
Ben Murdoch
cde7efde0c
am a95e9da7: Merge "Make the WebCore thread watchdog opt in." into jb-dev
...
* commit 'a95e9da760198b06afe0c1bbe828c2f75b52070e':
Make the WebCore thread watchdog opt in.
2012-05-24 09:33:30 -07:00
Ben Murdoch
a95e9da760
Merge "Make the WebCore thread watchdog opt in." into jb-dev
2012-05-24 09:30:10 -07:00
Brian Colonna
bb05da29e6
am af239b5f: am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
...
* commit 'af239b5f74ab95a7f373134e5e94fe51317bfa0c':
Fix 6449259: FUL no longer overlaps music controls
2012-05-24 08:59:54 -07:00
Brian Colonna
af239b5f74
am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
...
* commit 'fd824487dc2dd3eb386148af9a0618aab9a99c60':
Fix 6449259: FUL no longer overlaps music controls
2012-05-24 08:55:29 -07:00
Brian Colonna
fd824487dc
Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-dev
2012-05-24 08:50:58 -07:00
Jean-Baptiste Queru
6fdd244a50
am 31b5e5d1: am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
...
* commit '31b5e5d15972aa7c0e7579798a459c983c5610f9':
libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 08:12:12 -07:00
Jean-Baptiste Queru
31b5e5d159
am f75b6052: (-s ours) am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
...
* commit 'f75b6052132f1f748ae77891f6fedd1957508811':
libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 08:07:45 -07:00
Jean-Baptiste Queru
f75b605213
am 55536138: Merge "libstagefright/matroska: Fix build with gcc 4.7"
...
* commit '55536138cc0febbe83608ee0103aaa9a5202e31f':
libstagefright/matroska: Fix build with gcc 4.7
2012-05-24 07:59:28 -07:00
George Mount
7e9f62ef48
Use setCustomSelectActionModeCallback to disallow action bar.
...
Bug 5993716
Use setCustomSelectActionModeCallback rather than
setLongClickListener to disallow custom action block so
that long press can bring up the paste window.
Change-Id: I916e77dcea7914c02191f0ecda37cd126318807d
2012-05-24 07:43:27 -07:00
Jean-Baptiste Queru
819ba00afc
am 8a113a4a: am fe34006d: (-s ours) am 05cd296e: Merge "libmedia: Fix build with gcc 4.7"
...
* commit '8a113a4a9cecdaab0fb439a49cdd26291b1708b8':
libmedia: Fix build with gcc 4.7
2012-05-24 06:59:01 -07:00