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

101843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
1e7298b250 Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev 2013-03-20 20:53:01 +00:00
Jeff Sharkey
cc5911686d Merge "Show notification ticker for finished bugreports." into jb-mr2-dev 2013-03-20 19:11:45 +00:00
Jeff Sharkey
e37e9ba3ca Show notification ticker for finished bugreports. 
Change-Id: I7d326b0da83c3ae334739cdb8cb4ca18f948c50f
 2013-03-20 12:10:51 -07:00
Fabrice Di Meglio
90179dc6aa Merge "Fix bug #8205589 Media Framework UI should be mirrored for RTL languages" into jb-mr2-dev 2013-03-20 17:46:03 +00:00
Baligh Uddin
15d9de0960 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-20 17:15:06 +00:00
Jeff Tinker
d4a2118585 Merge "Implementing MediaDrm APIs" into jb-mr2-dev 2013-03-20 16:48:52 +00:00
Baligh Uddin
06d59ad05c Import translations. DO NOT MERGE 
Change-Id: I5f8e095504000dada72590b5043a7c7ad85de245
Auto-generated-cl: translation import
 2013-03-20 09:06:00 -07:00
Irfan Sheriff
63f1e2fb6b Merge "Add API to control scan always mode" into jb-mr2-dev 2013-03-20 15:49:20 +00:00
Romain Guy
ec3928bf09 Merge "Reduce number of glDraw calls when drawing text" into jb-mr2-dev 2013-03-20 02:29:47 +00:00
Scott Main
4427db27b3 am 8efa65b1: am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '8efa65b18324b0efb76d316b05ccf917e000c69a':
  delete some obsolete links
 2013-03-19 18:40:29 -07:00
Scott Main
8efa65b183 am be83b5a7: am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'be83b5a72ffaf3ed91e9341340c0c0477005f538':
  delete some obsolete links
 2013-03-19 18:38:05 -07:00
Scott Main
be83b5a72f am 7df36bc8: am f2162147: am 6dbb6788: delete some obsolete links 
* commit '7df36bc872e64b330d2a801adafee52e14112ec9':
  delete some obsolete links
 2013-03-19 18:36:15 -07:00
Scott Main
7df36bc872 am f2162147: am 6dbb6788: delete some obsolete links 
* commit 'f2162147c1dd8bd027a01f660108d214174379b5':
  delete some obsolete links
 2013-03-19 18:35:01 -07:00
Scott Main
f2162147c1 am 6dbb6788: delete some obsolete links 
* commit '6dbb6788b9ea32f36f6653fe48a0e00179540555':
  delete some obsolete links
 2013-03-19 18:32:33 -07:00
Scott Main
6dbb6788b9 delete some obsolete links 
Change-Id: I1495295caa878c55536e60e84caf358d80705507
 2013-03-19 18:27:50 -07:00
Yu Shan Emily Lau
a850e7fae4 Merge "Fix the media memeory stress test. The media memory stress test used the ps mediaserver to capture the memory usage of mediaserver. As the media.log is enabled recently, when runnign the ps mediaserver, it will show both entries. The fix is simply skip the first two lines and parse the laste output." into jb-mr2-dev 2013-03-20 00:58:31 +00:00
Fabrice Di Meglio
d410ccb1cb Fix bug #8205589 Media Framework UI should be mirrored for RTL languages 
- force LTR layout direction for MediaController UI elements

Change-Id: Ia2b8058d16e2587314b6f01cf935a5599c2983c9
 2013-03-19 17:45:43 -07:00
Yu Shan Emily Lau
780dc88ddb Fix the media memeory stress test. 
The media memory stress test used the ps mediaserver to
capture the memory usage of mediaserver. As the media.log
is enabled recently, when runnign the ps mediaserver, it will
show both entries. The fix is simply skip the first two lines
and parse the laste output.

Change-Id: Ib2a4ba7936505b4ea24463bf8a5af2c499b71138
 2013-03-19 17:42:50 -07:00
Romain Guy
661a87ec28 Reduce number of glDraw calls when drawing text 
This change moves the mesh buffer from FontRenderer to CacheTexture
to help reduce the number of texture binds and glDraw calls when
drawing text that spans across multiple textures.

Change-Id: I7de574d88313ca3672879ca878c253ff5f131fc1
 2013-03-19 17:24:13 -07:00
Mathias Agopian
0a4962ad11 Merge "make Surface.java internal state thread-safe" into jb-mr2-dev 2013-03-20 00:23:32 +00:00
Mathias Agopian
75d7309eb4 Merge "Fix createSurface / eglCreateWindowSurface race." into jb-mr2-dev 2013-03-20 00:21:11 +00:00
Jim Miller
b3ba365c5c Merge "Use persistent IRCD in KeyguardUpdateMonitor to show/hide music" into jb-mr2-dev 2013-03-20 00:02:12 +00:00
Craig Mautner
dd8c10b855 Merge "Clear mWindowAdded when window was not added. DO NOT MERGE" into jb-mr2-dev 2013-03-20 00:00:17 +00:00
Jim Miller
8f09fd2e31 Use persistent IRCD in KeyguardUpdateMonitor to show/hide music 
Now that we can have multiple IRemoteControlDisplays, create a
persistent one in KeyguardUpdateMonitor so we can more efficiently
show and hide the music controls in keyguard.

Update after review: get the current state from KeyguardUpdateMonitor
*before* the first call to showApprpriateWidgetPage().  This fixes
a flash that was sometimes seen when transitioning between orientations.

Fixes bug 7517659

Change-Id: I1b7b6f4222a99891ec06d6b6fd779dd0b86cc367
 2013-03-19 16:59:29 -07:00
Craig Mautner
f403b1fe50 Clear mWindowAdded when window was not added. DO NOT MERGE 
If ViewRootImpl throws BadTokenException when adding a window, clear
the indication that a window has been added. That way when the
window is destroyed it doesn't try to clean it up.

Fixes bug 8409506.

Change-Id: I270740762f21ed4ec7f235344a3adaeaa033c483
 2013-03-19 16:58:00 -07:00
Irfan Sheriff
9f3d55056f Merge "Fix reading sleep policy" into jb-mr2-dev 2013-03-19 22:48:13 +00:00
Irfan Sheriff
9f2e83135c Fix reading sleep policy 
Bug: 8418823
Change-Id: I432b0a1a7a13dcdd834f6a1c943b06937444f406
 2013-03-19 14:32:11 -07:00
Jason Sams
4e43d76e82 Merge "Move compute tests from frameworks/base to frameworks/rs" into jb-mr2-dev 2013-03-19 20:47:42 +00:00
Fabrice Di Meglio
5054803a02 Merge "Add missing ViewDebug infos for View.getTextDirection()" into jb-mr2-dev 2013-03-19 20:45:52 +00:00
ztenghui
effc9b4839 Add the orientation hint to the MediaMuxer 
bug:7991013

Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
 2013-03-19 13:10:25 -07:00
Jason Sams
eacf9c8041 Move compute tests from frameworks/base to frameworks/rs 
Change-Id: I670027782f5ba6df0713dbdc3c99ae7c1eef7d22
 2013-03-19 12:43:46 -07:00
Elliott Hughes
80828f465a am c1562075: am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit 'c1562075b0be58fa9dd09c2f2e9fa45601088574':
  Remove dead code from DateUtils.
 2013-03-19 12:27:10 -07:00
Elliott Hughes
c1562075b0 am ebebb80b: Merge "Remove dead code from DateUtils." 
* commit 'ebebb80b4a629756128b5a4fcf483133f01dbfd7':
  Remove dead code from DateUtils.
 2013-03-19 12:24:50 -07:00
Romain Guy
df9d2ba9b0 Merge "Minimize texture binds when drawing text" into jb-mr2-dev 2013-03-19 18:56:19 +00:00
Fabrice Di Meglio
83f15e657c Add missing ViewDebug infos for View.getTextDirection() 
- as getTextDirection() values were not showing in hierarchyviewer

Change-Id: I4ae74963a3c3b350ba996d098e5714b6538d9553
 2013-03-19 11:45:56 -07:00
Elliott Hughes
ebebb80b4a Merge "Remove dead code from DateUtils." 2013-03-19 18:45:54 +00:00
Elliott Hughes
9a6fa1d637 Remove dead code from DateUtils. 
This stuff is @hide, @deprecated, unused, and was never in any API level.

Change-Id: I87d132d77d7296a2de8527e05c2def362cab1c37
 2013-03-19 11:36:12 -07:00
Romain Guy
115096f50a Minimize texture binds when drawing text 
When several CacheTextures are used to draw text, sort the
draw batches by texture ID to minimize state changes in the
driver.

This change also tweaks the font cache size and renames
a property that was too long to be set using setprop.

Change-Id: I0a36dfffe58c9e75dd7384592d3343c192d042b1
 2013-03-19 11:32:41 -07:00
Fabrice Di Meglio
2d18e52b00 Merge "Fix bug #8335710 TextView can't clear CompoundDrawables" into jb-mr2-dev 2013-03-19 17:39:11 +00:00
Romain Guy
4688832024 Merge "Update hardware acceleration compatibility docs" into jb-mr2-dev 2013-03-19 17:36:43 +00:00
Romain Guy
bbb4e03ad4 Update hardware acceleration compatibility docs 
Change-Id: I3848eb281a06f4bdcbd603e9f624eff73314a4ec
 2013-03-19 10:31:38 -07:00
Elliott Hughes
6d3b13384e am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 
* commit 'c9fe40ead549ff18393c0cc5c6e3bd67548f9da6':
  Fix times in debugging output to use H rather than k.
 2013-03-19 10:13:34 -07:00
Elliott Hughes
c9fe40ead5 am 71558f1f: Merge "Fix times in debugging output to use H rather than k." 
* commit '71558f1fafa29fe993ab0556bbaee6530f3930d7':
  Fix times in debugging output to use H rather than k.
 2013-03-19 10:11:19 -07:00
Elliott Hughes
71558f1faf Merge "Fix times in debugging output to use H rather than k." 2013-03-19 16:50:39 +00:00
Elliott Hughes
b5482b2f8a am bab316fe: am e79af7df: Merge "Fix build." 
* commit 'bab316fea269369194d3126a5d79409c9192580f':
  Fix build.
 2013-03-19 09:31:13 -07:00
Elliott Hughes
ab8278e2eb am 54519e70: Fix build. 
* commit '54519e7041c9e30cefa1a175563f6a2f9bd2e478':
  Fix build.
 2013-03-19 09:31:09 -07:00
Elliott Hughes
f7c01e5a8a am eda35cb7: am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k." 
* commit 'eda35cb7c5781a32b038f1ef76b8e50f26f9bfaf':
  Clean up (some of) our many clocks to use H instead of k.
 2013-03-19 09:31:04 -07:00
Scott Main
d7cbec6d10 am da9f385a: am 2e1e8928: am a2f80853: am 49e43bb8: am e21406cb: add search tags for Design patterns 
* commit 'da9f385abc83c459fd87e3cadaec347e91ac5b5c':
  add search tags for Design patterns
 2013-03-19 09:31:00 -07:00
Scott Main
6008fca61b am b4b84f64: am d95cad7c: am 1a7ad2cb: am be06c28e: am 36c27c4a: add search tags to Design building blocks 
* commit 'b4b84f64401cf559f33bd7af0666c5e04c5478b4':
  add search tags to Design building blocks
 2013-03-19 09:30:54 -07:00
Elliott Hughes
c3e513e51c am c5c6d416: am 6317315e: Merge "Deliberately break DateFormat.format\'s formatting of \'k\' for compatibility." 
* commit 'c5c6d4167b66c79652c5208a2dfe091a8c735e6d':
  Deliberately break DateFormat.format's formatting of 'k' for compatibility.
 2013-03-19 09:30:51 -07:00