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

69010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
e61cad321d resolved conflicts for merge of 532679a5 to master 
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
 2012-03-07 16:58:03 -08:00
Glenn Kasten
78c914f37a Merge "IAudioFlingerClient::ioConfigChanged param2 const" 2012-03-07 16:08:59 -08:00
Jamie Gennis
ac3c33745f Merge "BufferQueue: fixed issues with buffer slots not available" 2012-03-07 15:48:11 -08:00
Scott Main
2a2e61341b am a38efc8d: am f246facb: am e606cb46: docs: fix api dashboard 
* commit 'a38efc8d74cfb22943c8a6dd816979e2ed19f221':
 2012-03-07 15:40:13 -08:00
Scott Main
08a991c7cb am 0bcf5e37: am 5ab7b3d1: am e606cb46: docs: fix api dashboard 
* commit '0bcf5e37d2fcb1ef54a494dca7f218ed2009ca7a':
  docs: fix api dashboard
 2012-03-07 15:40:05 -08:00
Scott Main
cbcc184de9 am 3f584a05: am b7ffa62c: am 290684ac: docs: fix expansion library package name 
* commit '3f584a052346ff5bf32f316aeb2855aa7b4599c7':
 2012-03-07 15:40:01 -08:00
Scott Main
c083ff092b am 5844b626: am 1054c676: am 290684ac: docs: fix expansion library package name 
* commit '5844b6265292e1e8b22d6f1179e28bacc11c057b':
  docs: fix expansion library package name
 2012-03-07 15:39:58 -08:00
Scott Main
ae682ae6ba am caa8d287: am a216ff33: am a47d88a7: docs: dashboard update for march 5 
* commit 'caa8d28790b9e90dd1a16a2557de0b6da099e45f':
 2012-03-07 15:39:45 -08:00
Andrew Flynn
e99022cecd am 6087dfcc: (-s ours) DO NOT MERGE Return 1.5 * density as default for large screens. 
* commit '6087dfcce1d095299a7d30d304903acf3e6fb541':
  DO NOT MERGE Return 1.5 * density as default for large screens.
 2012-03-07 15:39:43 -08:00
Ramanan Rajeswaran
62b7629cc0 am 4ec961d5: (-s ours) DO NOT MERGE 
* commit '4ec961d5752363161cc78112fbe542b1c0473158':
  DO NOT MERGE
 2012-03-07 15:39:40 -08:00
Dianne Hackborn
be9dcb0b00 am b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'b663a4b7da68cc6d81d4b338d94fb48eaec8cb05':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-03-07 15:39:38 -08:00
Ramanan Rajeswaran
2f25e61b87 am 5e7bb1e6: (-s ours) DO NOT MERGE 
* commit '5e7bb1e675df2cc1edd9808afcaaeed07830bd9f':
  DO NOT MERGE
 2012-03-07 15:34:11 -08:00
Dianne Hackborn
235cc3f5b7 am e6a0ec60: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. 
* commit 'e6a0ec60607783b426b92f638055c79178fdd892':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
 2012-03-07 15:34:10 -08:00
JP Abgrall
d313c3adbd Merge "dumpstate: more tweaks in the data collection order." 2012-03-07 15:30:53 -08:00
Jim Miller
8247add51d Merge "Fix 6119433: disambiguate screen brightness changes from other lights" 2012-03-07 15:21:31 -08:00
Eric Fischer
94828c3f3b Merge "Import translations. DO NOT MERGE" 2012-03-07 15:02:24 -08:00
Eric Fischer
bb10f1dbfb Merge "Import translations. DO NOT MERGE" 2012-03-07 15:02:17 -08:00
Jim Miller
18651804ff Fix 6119433: disambiguate screen brightness changes from other lights 
This fixes a bug where the code asked to change the keyboard brightness
on a device that doesn't support it.  Instead of animating the keyboard
brightness, it ended up animating the display brightness and invoking
the power off animation as a result.  The fix is to ignore keyboard
brightness because we don't have any devices that currently support it.

Change-Id: I672d89f92f991812ea676f19c40058b2d3008656
 2012-03-07 14:59:06 -08:00
Eric Fischer
83ba2df45d Merge "Import translations. DO NOT MERGE" 2012-03-07 14:53:07 -08:00
John Reck
39aae0cefb Merge "Don't draw the focus ring if we don't have focus" 2012-03-07 14:42:20 -08:00
Mathias Agopian
fc004c1350 Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect" 2012-03-07 14:18:54 -08:00
Daniel Lam
c930cf3cf3 BufferQueue: fixed issues with buffer slots not available 
Bug: 6120953
Change-Id: Ief43f042ee9e1512e86fff8632a1c9dd31bdff35
 2012-03-07 14:15:34 -08:00
Chris Craik
28ae199eee Merge "reenable webkit paint pausing" 2012-03-07 14:12:41 -08:00
Eric Fischer
6ff1f4fa5d Import translations. DO NOT MERGE 
Change-Id: I7cfb3eeb7743f4db15ff591826d16cc316e2d915
 2012-03-07 14:03:43 -08:00
Eino-Ville Talvala
d5f0799082 Merge "NEW_API: Rework CameraSound into MediaActionSound, and unhide it." 2012-03-07 13:54:43 -08:00
Eric Fischer
1ff8796440 Import translations. DO NOT MERGE 
Change-Id: I1d2217605c628c8d31d2604fe9a1ee53b541fd15
 2012-03-07 13:17:06 -08:00
Eric Fischer
ea7b04383e Import translations. DO NOT MERGE 
Change-Id: Ibbe207f9def9c09b12bb3b408e40e0060658448d
 2012-03-07 13:05:31 -08:00
Glenn Kasten
7072dce011 Merge "Isolate references to outputTracks/mOutputTracks" 2012-03-07 12:25:28 -08:00
Jeff Sharkey
8f409bcd4b Merge "Caliper benchmarks for Parcel." 2012-03-07 12:07:01 -08:00
Chris Craik
07b201194a reenable webkit paint pausing 
bug:6016196

Change-Id: I4fcab8d84b39f033724c45845ef6c67b3071c509
 2012-03-07 11:59:25 -08:00
Jean-Michel Trivi
e8bacb4ea0 Merge "Effect for multichannel PCM downmix to stereo" 2012-03-07 11:53:21 -08:00
John Reck
413fab3f44 Don't draw the focus ring if we don't have focus 
Change-Id: Icb03060a03caf817ea39935bb56e14b5c86ed57b
 2012-03-07 11:41:19 -08:00
Michael Jurka
1ce1307641 Merge "Don't draw layers in buildLayer()" 2012-03-07 11:25:20 -08:00
Glenn Kasten
08d2c04194 Isolate references to outputTracks/mOutputTracks 
Move all references to DuplicatingThread::outputTracks and
DuplicatingThread::mOutputTracks from the common threadLoop() into
virtual methods.  This allows them to be moved from PlaybackThread to
DuplicatingThread, and to be marked private.

Also use vector assignment to copy mOutputTracks to outputTracks.

Change-Id: Ieb1cf1ad36b8a65143e61e6c92a65fb43427e5e2
 2012-03-07 11:04:55 -08:00
Glenn Kasten
9778bd1f33 Merge "Make applyVolume private to DirectOutputThread" 2012-03-07 10:44:29 -08:00
Eric Fischer
eeaff65bf0 Merge "Mark all of config.xml not translatable in the top-level comment." 2012-03-07 10:43:23 -08:00
Glenn Kasten
e012783db8 Make applyVolume private to DirectOutputThread 
Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271
 2012-03-07 10:40:43 -08:00
Glenn Kasten
ed4271e1c1 Merge "Add comments about sequence for setting parameters" 2012-03-07 10:38:12 -08:00
Jean-Michel Trivi
64143abe1f Effect for multichannel PCM downmix to stereo 
First pass at implementing an audio effect whose role is to
 downmix multichannel PCM buffers to stereo.
The effect is not handling volume changes.
The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations,
 to optimize the most commom configurations, and does not yet handle
 generic multichanel configurations.

Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
 2012-03-07 10:17:19 -08:00
Alex Sakhartchouk
42f23b3cfe Merge "Adding more modes to the sampler test app. Fixing pixel placement." 2012-03-07 09:25:56 -08:00
Glenn Kasten
761415bd7f Merge the calls to prepareTracks_l 
Change-Id: I1dd759581333e2908d980180d44db7bf5ed6591d
 2012-03-07 07:28:12 -08:00
Glenn Kasten
ff249c0dc8 Merge "Remove references to sched_policy.h in RS" 2012-03-07 07:16:46 -08:00
Jeff Sharkey
091ca2d5fb Merge "Avoid updating network stats after shutdown." 2012-03-06 20:04:26 -08:00
Jeff Sharkey
6341fcecc8 Avoid updating network stats after shutdown. 
Bug: 6109476
Change-Id: I9a3a8b182c8fa56d83ddc755d204d5b267c9bc5d
 2012-03-06 19:59:57 -08:00
Dianne Hackborn
5eb37241fe Merge "Work on more low memory reporting to apps." 2012-03-06 19:06:25 -08:00
Dianne Hackborn
27ff913d56 Work on more low memory reporting to apps. 
There are now some new trim memory levels that are sent to
non-background applications as RAM becomes low.

There is a new API for an application to retrieve information
about memory trimming and such on demand.

Fixed various checks against the memory trim level to be
robust (not compare against exact values).

Change-Id: Ifd1c6151124350168aef20a94e517166fd2e03eb
 2012-03-06 18:46:32 -08:00
Mathias Agopian
3e964c55ac attempt to fix a deadlock in SurfaceTextureClient::disconnect 
- condition wasn't signaled if an error happened between acquire and release
- also replace signal with broadcasts

Bug: 6109450
Change-Id: Iaf9371b829f772f559daae42e06d4dbd9505d6a0
 2012-03-06 18:26:54 -08:00
John Reck
afeecb0740 Merge "Fix focus rings for buttons" 2012-03-06 18:22:14 -08:00
John Reck
ef109b0b70 Fix focus rings for buttons 
Bug: 6124914

Change-Id: I8cb63de2636afc297756de7733de7bdda920b694
 2012-03-06 18:02:11 -08:00
Adam Powell
494e155a5a Merge "Fix some action bar menu layout bugs around config changes" 2012-03-06 17:43:48 -08:00