Jason Noguchi
2437a4ab02
am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
2012-02-28 11:57:39 -08:00
Jason Noguchi
eb5698a6b9
am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:55:13 -08:00
Jason Noguchi
bb18957461
am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
2012-02-28 11:53:49 -08:00
Jason Noguchi
a1de5e4812
am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:52:56 -08:00
Jason Noguchi
743aceec42
am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:50:14 -08:00
Jason Noguchi
eac4b187d3
am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
...
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
2012-02-28 11:49:30 -08:00
Jason Noguchi
ee32993095
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
2012-02-28 11:47:46 -08:00
John Reck
42fb45588f
Merge "Fix cursorRingBounds NPE"
2012-02-28 11:40:00 -08:00
John Reck
c2baeffe00
Merge "Fix NPE"
2012-02-28 11:38:56 -08:00
John Reck
5528d7ccd1
Fix cursorRingBounds NPE
...
Bug: 6083657
Change-Id: I0aa30bc1df266b2f74b0fedfb635b71d63638fdb
2012-02-28 11:29:29 -08:00
Dianne Hackborn
ef437848ca
Merge "You could think of this as what an OEM might do."
2012-02-28 11:26:02 -08:00
James Dong
8fe9260bbb
Merge "Deprecated a mis-spelled method and replaced it with a new method"
2012-02-28 11:23:26 -08:00
John Reck
79d99bebc1
Fix NPE
...
Bug: 6083360
Change-Id: I8d4a4cfb4ca0bbefd848a6ed7a628bc3838e4f91
2012-02-28 11:21:17 -08:00
Android Git Automerger
af2abf5ada
am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
...
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
2012-02-28 10:51:35 -08:00
Svetoslav Ganov
0631ac93f6
am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
2012-02-28 10:51:32 -08:00
Android Git Automerger
a66926ff7f
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
2012-02-28 10:49:07 -08:00
Svetoslav Ganov
69db4df487
am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:41:42 -08:00
Svetoslav Ganov
8f4582a278
am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:39:17 -08:00
Svetoslav Ganov
0c96daa5d5
am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:38:39 -08:00
Svetoslav Ganov
0c7ffac4ca
am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:35:43 -08:00
Svetoslav Ganov
c78f121716
am a2b41b43: NumberPicker showing IME when its input field gains focus.
...
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
2012-02-28 10:35:18 -08:00
Glenn Kasten
f64dfccd96
Merge "Unlock effect chains in the middle of two if's"
2012-02-28 07:23:42 -08:00
Glenn Kasten
c2dc1c4e57
Merge "Simplify removeNotificationClient"
2012-02-28 07:21:51 -08:00
Glenn Kasten
eb70fe50dd
Merge "AudioFlinger const methods and parameters"
2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
9bb891faf4
am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
d92a683fb9
am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
...
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
Add stubs for better compatibility
2012-02-28 07:19:36 -08:00
Glenn Kasten
0d07b6a55f
Merge "Fix theoretical race condition in addOutputTrack"
2012-02-28 07:18:27 -08:00
Glenn Kasten
2b119a6336
Merge "AudioBufferProvider comments and cleanup"
2012-02-28 07:17:47 -08:00
Mathias Agopian
aac99487a1
Merge "a window could get stuck to gpu composition"
2012-02-27 19:48:36 -08:00
Mathias Agopian
3169e4bd15
Merge "move CursorWindow from libbinder to libandroidfw"
2012-02-27 19:48:21 -08:00
Dianne Hackborn
d459f4bbfc
You could think of this as what an OEM might do.
...
Except it does nothing.
But eat resources.
Yum, yum!
Current we create five processes. The main process sucks up 16MB of
RAM and creates a full-screen window; only on high-end devices does
the window (and process) use the GPU.
The second through fourth processes just sits there not really doing
anything except using process overhead.
The fifth process runs a background service, slowing eating RAM until
it gets killed by the system (as the system will ultimately do with
background services). It also creates a full-screen window, and always
uses the GPU even on low-end devices.
Change-Id: Ibe9e25f7dbd889f4dc83eed6a3c09b9b0437b4e3
2012-02-27 18:46:29 -08:00
James Dong
c4a9976aa1
Deprecated a mis-spelled method and replaced it with a new method
...
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
2012-02-27 18:25:31 -08:00
Mathias Agopian
49d2b1864c
move CursorWindow from libbinder to libandroidfw
...
Change-Id: I3b304e4f74e0d0ec8b20c57296c62449c9a0f792
2012-02-27 18:11:20 -08:00
Jeff Sharkey
6f9d697d83
Merge "Move NetworkStatsFactory to faster ProcFileReader."
2012-02-27 18:09:29 -08:00
Jeff Sharkey
1d29a3064f
Move NetworkStatsFactory to faster ProcFileReader.
...
Less GC overhead, and about 8x faster parse times. Verified that
tests pass.
Change-Id: Iff1d374f36103395a193176a88a57eebffa93c56
2012-02-27 18:08:13 -08:00
Jamie Gennis
ed6c6575a9
Merge "Add tracing to various graphics components."
2012-02-27 18:06:39 -08:00
Jamie Gennis
a85ca37c84
Add tracing to various graphics components.
...
This change adds ATRACE call tracing to BufferQueue,
SurfaceTextureClient, SurfaceTexture, SurfaceFlinger, Layer, and EGL.
Change-Id: I9d75ed26f5a3f0d1af635da38289520134cfbbb7
2012-02-27 17:50:35 -08:00
Jeff Sharkey
d3b0b5df3f
Merge "Suppress StrictMode when reading /proc/ files."
2012-02-27 17:44:09 -08:00
Jeff Sharkey
453dafa663
Suppress StrictMode when reading /proc/ files.
...
Bug: 6077051
Change-Id: If4f23e947d8b91f9f124baa0460600a6b9353732
2012-02-27 17:42:34 -08:00
Adam Powell
bce4d98609
Merge "View pressed state dispatching tweaks"
2012-02-27 17:38:51 -08:00
Mathias Agopian
74c961013a
Merge "remove dependency on unneeded headers"
2012-02-27 17:38:27 -08:00
Mathias Agopian
021df141ed
remove dependency on unneeded headers
...
Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
2012-02-27 17:37:26 -08:00
Chia-chi Yeh
eb8ab685c2
Merge "VpnDialogs: hide the fields when the statistic numbers are unavailable."
2012-02-27 17:35:06 -08:00
Svetoslav Ganov
a2b41b438d
NumberPicker showing IME when its input field gains focus.
...
1. The NumberPicker was showing the IME if the input field
gets focus and hiding it when the the arrows are pressed.
The leads to a nasty behavior when the input is the first
focusable and the uses presser an arrow button. In such
a case the IME shows and hides on every arrow press pushing
the window content up and down - this looks pretty ugly.
Now the IME is show on double tap of the input field.
2. The NumberPicker input now by default has an IME action
done, hence after editing it the IME goes away.
3. The NumberPicker input now clears focus when it gets
IME action done, so the last picker in a sequence
does not show selection which is focus driven.
4. NumberPicker was incorrectly detecting double tap to
begin edit and it was possble to start edit on singe tap
if the user has double tapped before to start an edit.
Now double tap detection is using the double tap timeout
correctly.
bug:6071977
Change-Id: I0ff5a491064e51663b3abec675d839d0a65b986a
2012-02-27 17:32:54 -08:00
Chia-chi Yeh
b0736abca9
VpnDialogs: hide the fields when the statistic numbers are unavailable.
...
Bug: 5954284
Change-Id: I2321984d4f423e951989d799073a9da17a577ef9
2012-02-27 17:30:41 -08:00
Michael Jurka
cbaa666955
Merge "Remove unnecessary code"
2012-02-27 17:15:41 -08:00
Jamie Gennis
6835237f6f
Merge "Removed dependecies between BufferQueue and SurfaceTexture"
2012-02-27 17:06:53 -08:00
JP Abgrall
95bbbf5223
Merge "dumpstate: use /system/xbin/su directly"
2012-02-27 17:05:55 -08:00
Jean-Baptiste Queru
254cf5973e
am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
...
* commit '7b6b81f89538d34415869710cbf464ba7c28bf9b':
stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-27 17:02:15 -08:00
Dave Burke
e5c484cb55
Merge "Increase max size of log size by 50% on userdebug builds."
2012-02-27 17:01:38 -08:00