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

101297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
6d190338fc am 0e5b5f66: am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 
* commit '0e5b5f6619f45db6cdff7757d208c197a3d4a3b1':
  EntropyMixer: Write entropy at shutdown / reboot / power
 2013-03-04 22:45:44 +00:00
Nick Kralevich
0e5b5f6619 am 0841c4cb: Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 
* commit '0841c4cbdcedd32bfea4126d17876c6c892875e8':
  EntropyMixer: Write entropy at shutdown / reboot / power
 2013-03-04 22:44:03 +00:00
Irfan Sheriff
2ba8de33ec am bfadb84f: am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev 
* commit 'bfadb84f9d44ee2f74db394cec431059201b0086':
  Clean up statemachine
 2013-03-04 22:42:10 +00:00
Irfan Sheriff
bfadb84f9d am f9d3020c: Merge "Clean up statemachine" into jb-mr2-dev 
* commit 'f9d3020c575fd20097f599dc336a3b448415b7d7':
  Clean up statemachine
 2013-03-04 22:40:35 +00:00
Nick Kralevich
0841c4cbdc Merge "EntropyMixer: Write entropy at shutdown / reboot / power" into jb-mr2-dev 2013-03-04 22:40:17 +00:00
Irfan Sheriff
f9d3020c57 Merge "Clean up statemachine" into jb-mr2-dev 2013-03-04 22:38:30 +00:00
Christopher Tate
2455ea0622 am f9ed8be1: (-s ours) am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev 
* commit 'f9ed8be17da47f5003205bf1fbfc87a300de10f0':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached
 2013-03-04 22:18:14 +00:00
Christopher Tate
f9ed8be17d am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev 
* commit '8edd78499e2656916e89eeae91aa0f023f69eddc':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached
 2013-03-04 22:13:33 +00:00
Christopher Tate
8edd78499e Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev 2013-03-04 22:11:43 +00:00
Christopher Tate
267097b00b DO NOT MERGE: Don't crash when we get a drag-ended after being detached 
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

(Cherrypicked from downstream)

Bug 8298439

Change-Id: Ic14cbf9fdc305b91c1627f6882a45d34ee1c34ae
 2013-03-04 14:02:29 -08:00
Romain Guy
54fed868c8 am f2f3988e: am e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 
* commit 'f2f3988ecba293e88a661bfe0a5bbd76de79224a':
  Take text scale/skew into account only when rendering into a layer
 2013-03-04 21:55:43 +00:00
Romain Guy
f2f3988ecb am e7d32b19: Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 
* commit 'e7d32b19b46c65ff37001e456bedf68222599119':
  Take text scale/skew into account only when rendering into a layer
 2013-03-04 21:53:42 +00:00
Romain Guy
e7d32b19b4 Merge "Take text scale/skew into account only when rendering into a layer" into jb-mr2-dev 2013-03-04 21:49:16 +00:00
Romain Guy
19d4dd8599 Take text scale/skew into account only when rendering into a layer 
3D rotations can undo scale/skew transforms; since FreeType only accepts
2x2 matrices we can end up generating very large glyphs that are drawn
at a 1:1 scale on screen. For instance, if the current transform has a
scale of 2000 set on both X and Y axis and a perspective Z factor set to
Z, the actual scale factor on screen ends up being 1. We would however
generate glyphs with a scale factor of 2000 causing the font renderer
to blow up.

Change-Id: Ia5c3618d36644e817825cb9c89e2f53aece2074e
 2013-03-04 13:48:43 -08:00
Nick Kralevich
79619ddbfe EntropyMixer: Write entropy at shutdown / reboot / power 
Write out entropy if we're shutting down or rebooting,
or if someone plugs in the power.

Bug: 8312061
Change-Id: Id9a48064a7bdfe6c05a9227ea95a1bdbd0e9b8ae
 2013-03-04 13:46:45 -08:00
Irfan Sheriff
fd7adc58ec Clean up statemachine 
- Remove a few unnecessary states. Driver is part of kernel for all devices.
- Clean up some logs

Change-Id: Id067bd944fcb01a279485b8fb3251c92a6894c55
 2013-03-04 13:41:50 -08:00
Christopher Tate
7da74d3f93 Merge "Don't crash when we get a drag-ended after being detached" 2013-03-04 21:41:33 +00:00
Christopher Tate
e9accff210 Don't crash when we get a drag-ended after being detached 
Removing view groups during a drag would cause an NPE here.  The
child views will still get the drag-ended event as expected.

Bug 8298439

Change-Id: I665ba1d139e8aaa820f5f515186bc4ce8bcdb1ea
 2013-03-04 13:19:39 -08:00
Ben Murdoch
c8e0145894 am 87adbaa3: (-s ours) am 4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 
* commit '87adbaa3e0d156ea7f8264297b744ad212a68b4c':
  Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
 2013-03-04 19:46:00 +00:00
Ben Murdoch
87adbaa3e0 am 4c333e17: Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 
* commit '4c333e177220387cf6746d47e1948bbfcc374512':
  Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE
 2013-03-04 19:43:37 +00:00
Ben Murdoch
4c333e1772 Merge "Update WebView#loadDataWithBaseURL documentation. DO NOT MERGE" into jb-mr2-dev 2013-03-04 19:40:55 +00:00
Craig Mautner
a729a34ae6 Merge "Convert mHistory to mTaskHistory (8)" 2013-03-04 19:28:57 +00:00
Craig Mautner
a0dbf0ec01 Merge "Convert mHistory to mTaskHistory (7)" 2013-03-04 19:24:34 +00:00
The Android Open Source Project
d04b2cfded am e5e78ccb: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'e5e78ccb3dcf82c25efd369607524caff5821b1f':
  Restore the ability to track native Surface changes Bug #8230990
  Support 3D rotations when drawing text
  Account for text alignment in Op bounds calculation
  fix issue when replacement bitmap is larger than original.
  Revert ActivityManager changes for tasks. DO NOT MERGE
  Revert "Fix ListView is not scrolled properly with arrows"
  Update histories simultaneously.
  Revert "Update histories simultaneously."
  Update histories simultaneously.
  Add null check to setAppGroupId.
  Fix crashing bug in validator.
  Switch topRunning* and moveTaskTo*
  Trying to unregister a semi connected accessibility service.
  Begin switch over to task based history.
  Switch to system process before modifying rotation.
 2013-03-04 19:10:12 +00:00
The Android Open Source Project
e5e78ccb3d Reconcile with jb-mr2-release - do not merge 
Change-Id: I1bf36dd86f8c7a12978de0de6d9c19ec615f78e6
 2013-03-04 11:06:41 -08:00
Chris Craik
cfbad0b352 am 3e7dbf53: Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev 
* commit '3e7dbf5373732459b74fd698a6912d6115ed2870':
  Document that degenerate lines wont be drawn
 2013-03-04 19:03:22 +00:00
JP Abgrall
1be2b68204 am 62f16bfc: jni: net.TrafficStats: fix getIfaceStat, have it use the iface. 
* commit '62f16bfc5e90f0320ab68b66b5b5b125cada1867':
  jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
 2013-03-04 18:59:57 +00:00
Chris Craik
3e7dbf5373 Merge "Document that degenerate lines wont be drawn" into jb-mr2-dev 2013-03-04 18:58:19 +00:00
JP Abgrall
62f16bfc5e jni: net.TrafficStats: fix getIfaceStat, have it use the iface. 
Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
 2013-03-04 18:53:07 +00:00
Chris Craik
a5ef27da95 Document that degenerate lines wont be drawn 
bug:7658830

Skia and the HW acceleration path don't render anything for degenerate
lines.

Change-Id: I5ea6fe8f16533e5045a7cd10475f4240f6c311b6
 2013-03-04 10:41:55 -08:00
Irfan Sheriff
39aad005c6 am d2bfa3bd: Merge "Fix copy constructor" into jb-mr2-dev 
* commit 'd2bfa3bdc0a5d3c06cde2711d8572a8141e45fe2':
  Fix copy constructor
 2013-03-04 18:38:22 +00:00
Irfan Sheriff
d2bfa3bdc0 Merge "Fix copy constructor" into jb-mr2-dev 2013-03-04 18:32:49 +00:00
Irfan Sheriff
90082124aa Fix copy constructor 
Bug: 8300712
Change-Id: If1c41a9fe35ca5950382ffcc5759fc14641d0b04
 2013-03-04 10:28:42 -08:00
Derek Sollenberger
6eeb41cf21 am cdac4972: Deprecate read/write Pictures to streams. 
* commit 'cdac497289fd2c39a352f6167dae3f77cc608cb8':
  Deprecate read/write Pictures to streams.
 2013-03-04 15:24:42 +00:00
Derek Sollenberger
cdac497289 Deprecate read/write Pictures to streams. 
bug: 8241089
Change-Id: I435a534f5110cb2b8aba87c047b509020a22fd67
 2013-03-04 10:10:15 -05:00
The Android Automerger
898753cb74 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-04 05:55:46 -08:00
Michael Jurka
f43d20e70d am 7ac02bfb: Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev 
* commit '7ac02bfb862aec324b00f3919ff00a95ff1effa6':
  Fix RTL layout in Recent Apps, landscape mode
 2013-03-04 11:00:53 +00:00
Michael Jurka
7ac02bfb86 Merge "Fix RTL layout in Recent Apps, landscape mode" into jb-mr2-dev 2013-03-04 10:56:58 +00:00
Jeff Sharkey
4e6d19656e am 2e0da1ea: Merge "Improve performance of storage measurement." into jb-mr2-dev 
* commit '2e0da1ea5f2493d968b4b83d4a0dd54e2cc63849':
  Improve performance of storage measurement.
 2013-03-02 06:20:17 +00:00
Jeff Sharkey
2e0da1ea5f Merge "Improve performance of storage measurement." into jb-mr2-dev 2013-03-02 06:14:51 +00:00
Romain Guy
999871bc82 am 151b71cb: Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev 
* commit '151b71cb5259eabf9bdcdc9248ba5100ad4c5bcf':
  Fix math issue when transforming text in perspective
 2013-03-02 02:12:38 +00:00
Romain Guy
151b71cb52 Merge "Fix math issue when transforming text in perspective" into jb-mr2-dev 2013-03-02 02:08:18 +00:00
Romain Guy
874f5c6e4a Fix math issue when transforming text in perspective 
Change-Id: Iad6b4e477c11bd1ef5f0ceab2fabcd440030154d
 2013-03-01 18:07:35 -08:00
Jim Miller
2b0ce3f014 Merge "Re-enable USER_PRESENT broadcast in keyguard." 2013-03-02 00:41:54 +00:00
Jeff Sharkey
63d0a06799 Improve performance of storage measurement. 
When calculating directory sizes of data living on emulated external
storage, translate the path to use the internal backing data, which
avoids going through the emulation layer.  It carefully retreats to
the original path when it runs into trouble.

Testing with a hierarchy of 10 directories deep and 2 directories
and 10 files wide at each level, this change improves performance
from 5900ms before to 250ms after; over 20 times faster (!).

Bug: 8172425
Change-Id: Ia7365416f091e102bf7345a49f7d7209a22580a9
 2013-03-01 16:36:52 -08:00
Jim Miller
68da4dabfe Merge "Fix multi-user support in keyguard." 2013-03-02 00:20:08 +00:00
Romain Guy
49195f8b04 am 28459117: Merge "Precache glyphs at final raster size" into jb-mr2-dev 
* commit '28459117a797bbf09ac589af4c8083a98fdbfb90':
  Precache glyphs at final raster size
 2013-03-02 00:19:18 +00:00
Romain Guy
28459117a7 Merge "Precache glyphs at final raster size" into jb-mr2-dev 2013-03-02 00:13:17 +00:00
Romain Guy
0f6675332c Precache glyphs at final raster size 
The deferred display lists model now allows us to precache glyphs
at their exact size on screen.

This change also removes debug markers when the renderer defers
and reorders display lists. It also adds a flush event marker.

Change-Id: I66ec5216dc12b93ecfdad52a7146b1cfb31fbeb4
 2013-03-01 16:04:53 -08:00
Justin Koh
e0c5569d92 am 76f065d2: Merge "Add policy check to always show overflow menu button on TV devices." into jb-mr2-dev 
* commit '76f065d2e9d6354a59bb233b969c8417aff7223b':
  Add policy check to always show overflow menu button on TV devices.
 2013-03-02 00:01:26 +00:00