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

5130 Commits

Author SHA1 Message Date
Tom Hudson
d8f904f256 Revert "Merge six commits from master-skia to master" 
This reverts commit 550780745fa28ae9a87d02331841ca5ce4f9c763.

Change-Id: Ic71eccea454b26261fe6e9a9a7a24eff56396989
 2015-10-28 20:35:36 +00:00
Leon Scroggins III
550780745f Merge six commits from master-skia to master 
Include external/skia/include/private
use SrcConstraint for drawBitmapRect
clean up to allow removal of flags for SCALAR_DIV and IMAGEINFO_FIELDS
don't call DEPRECATED getDevice()
update to newer API for drawBitmapRect
asABitmap is deprecated, used isABitmap

Change-Id: I519f54f97321a7a365ea81a3b78cb03b9bdca021
previous-Change-Id: I12208855a95948897077b1c1549eb35416cc801e
previous-Change-Id: I5044f0f61315fe48c60d7af5e261a7d0ed574f56
previous-Change-Id: Ic34a3ba77b3f9e091fa7aaba75018a307abacdab
previous-Change-Id: I79f8dd779920565d1204f7fe67b3286b1bbf4e9b
previous-Change-Id: Ic04d1f8274f6a862ea00f8d241363cf31f5ec1ec
previous-Change-Id: I9e4ae257a1976c74302b6a73f17405174ae58cec
 2015-10-28 13:41:38 -04:00
Derek Sollenberger
eba81d0f88 Add missing include for SkPath 
Change-Id: Ib1577714d0e5c7e7c7d0e6593debe30e78f0df59
 2015-10-26 14:23:58 +00:00
Adrian Roos
f8ae610e8c Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b am: 5e5f718d23 
am: 989b719e64

* commit '989b719e649266f41353ff5266cabd5b42a297a5':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:37:05 +00:00
Adrian Roos
989b719e64 Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev am: 93a6b4c129 am: a53bbb652b 
am: 5e5f718d23

* commit '5e5f718d236234f3a4bc5826dc805b6b8c53283c':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 18:25:02 +00:00
Adrian Roos
a53bbb652b Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-dev 
am: 93a6b4c129

* commit '93a6b4c12904bd1804a540d006c183851b0aea33':
  Revert "Revert "Track ashmem memory usage in Parcel""
 2015-10-23 17:29:13 +00:00
Roozbeh Pournader
e1e654d09e Merge "Pass the whole locale list down to Minikin." 2015-10-23 01:39:28 +00:00
Adrian Roos
0450565d9a Revert "Revert "Track ashmem memory usage in Parcel"" 
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
 2015-10-22 17:49:38 -07:00
Ian Pedowitz
ab49c51342 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 am: 07129d53b5 
am: d3511518f9

* commit 'd3511518f927eead41fb33c56803104672dcffc2':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:53:24 +00:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:46:06 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:37 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel" 
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
 2015-10-22 22:09:04 +00:00
Roozbeh Pournader
f036ead2a2 Pass the whole locale list down to Minikin. 
Also, compute LocaleList's string representation at construction.
This is to further push the cost of doing costly operations related
to LocaleLists to construction time.

Change-Id: Ia55b8ce66b1088ff54cb42eb1e11149b5bd10f17
 2015-10-22 13:14:13 -07:00
Adrian Roos
b531762c89 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 
am: fda65d780e

* commit 'fda65d780eea9f696b087deb8d532b87e44877b6':
  Track ashmem memory usage in Parcel
 2015-10-22 01:02:27 +00:00
Adrian Roos
655c12edb0 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev 
am: 33e1d376eb

* commit '33e1d376ebd643cba5b507d0005b87d49e246bb5':
  Track ashmem memory usage in Parcel
 2015-10-22 00:49:52 +00:00
Adrian Roos
ab3f972403 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
(cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)
 2015-10-22 00:31:47 +00:00
Adrian Roos
bc14a194e0 Merge "Track ashmem memory usage in Parcel" 2015-10-22 00:31:17 +00:00
Adrian Roos
4701a496a5 Track ashmem memory usage in Parcel 
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
 2015-10-21 16:52:15 -07:00
Mathieu Chartier
1d67f3d3f1 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b am: efa447e1ab 
am: a6358d93a0

* commit 'a6358d93a0f1cbc6469c226f7a77858e00b7de77':
  Fix read_mapinfo to recognize free list large object space
 2015-10-20 01:15:28 +00:00
Mathieu Chartier
a6358d93a0 Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev am: 7f2deeeef5 am: df0cc41a7b 
am: efa447e1ab

* commit 'efa447e1ab5a51c96219fc1d6204c128dbbaf661':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:51:35 +00:00
Mathieu Chartier
df0cc41a7b Merge "Fix read_mapinfo to recognize free list large object space" into mnc-dr-dev 
am: 7f2deeeef5

* commit '7f2deeeef53887dcad74b8aed86936983353cec4':
  Fix read_mapinfo to recognize free list large object space
 2015-10-19 23:17:09 +00:00
Mathieu Chartier
2e2069d053 Fix read_mapinfo to recognize free list large object space 
Bug: 25081604

(cherry picked from commit 6421da8f46e2a60da55939d8a4f7d91ab286dfcf)

Change-Id: If676c2309e3e397676fa8cef21405c34db7d5db2
 2015-10-19 15:44:26 -07:00
Pablo Ceballos
63afb86381 Merge "Remove GLTrace support" 2015-10-19 17:55:59 +00:00
Seigo Nonaka
04cb787762 Merge "Remove MinikinSkiaFont::GetGlyph." 2015-10-19 04:07:44 +00:00
Ruben Brunk
78591f03b7 am 462b8b39: am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '462b8b3986fd194e08c78d66b6cc547af7388830':
  Fix lens shading map origin calculation.
 2015-10-17 07:19:43 +00:00
Ruben Brunk
462b8b3986 am 55dd957d: am 7a027807: am c03443b2: Fix lens shading map origin calculation. 
* commit '55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
  Fix lens shading map origin calculation.
 2015-10-17 07:13:24 +00:00
Ruben Brunk
7a027807a7 am c03443b2: Fix lens shading map origin calculation. 
* commit 'c03443b23de0b474080168d892cd685283c3285b':
  Fix lens shading map origin calculation.
 2015-10-17 07:01:19 +00:00
Ruben Brunk
c03443b23d Fix lens shading map origin calculation. 
Bug: 24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
 2015-10-17 06:55:15 +00:00
Chris Craik
cb45c10b81 Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 18:41:04 +00:00
Chris Craik
0fc1065af7 Use FastJNI for trivial MotionEvent native methods 
Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
 2015-10-16 11:39:50 -07:00
Chris Craik
78327393ac Merge "Rename DisplayListData to DisplayList" 2015-10-16 18:36:01 +00:00
Chris Craik
afae1463b3 Merge "Revert "Use FastJNI for trivial MotionEvent native methods"" 2015-10-16 17:43:08 +00:00
Chris Craik
526cf82652 Revert "Use FastJNI for trivial MotionEvent native methods" 
This reverts commit a44cd33b98ed011a62a912406eddc051f8b3ded1.

Change-Id: I9a907b0a880368dd61b481b642b50ab57ad08de8
 2015-10-16 17:42:57 +00:00
Chris Craik
003cc3dec8 Rename DisplayListData to DisplayList 
Change-Id: I25f6bb88ffdf9baf7e8e4e2a294aa8c9d2a4605b
 2015-10-16 10:38:34 -07:00
Chris Craik
c4c7aa14af Merge "Use FastJNI for trivial MotionEvent native methods" 2015-10-16 16:53:34 +00:00
Rob Carr
cbc4e08fb5 Merge "Revert "Sync SurfaceView position changes to parent render."" 2015-10-15 22:54:11 +00:00
Rob Carr
7e1d861a9a Revert "Sync SurfaceView position changes to parent render." 
This reverts commit 6104dc95606b3399356dd011ca6d71fcd954154c.

Change-Id: If9d709bc65e7a817bd2c1b5768c7c33a9317638f
 2015-10-15 22:53:30 +00:00
Rob Carr
70b7073fea Merge "Sync SurfaceView position changes to parent render." 2015-10-15 22:53:15 +00:00
Robert Carr
6104dc9560 Sync SurfaceView position changes to parent render. 
In order to provide pixel perfect movement of SurfaceViews
'within' other views (e.g. scrolling) we need to be able to
synchronize the attached (parent window) painting with the
movement of the SurfaceView (recall, SurfaceViews are positioned
behind their attached windows and the parent must render a
transparent region for the SurfaceView to appear). Provide
a new WindowManager method to reposition an attaching window
(that is to say, a window which has an attached window like
SurfaceView) and defer the transaction until the parent frame.
SurfaceView is hooked up to use this for movement. This is still
'racy' in the hardware accelerated case as the render thread
could be on either side of dequeing the frame we are working on.

Change-Id: Ic33915043380ab8cd9eb4920e224b35234ed867d
 2015-10-15 22:35:48 +00:00
Jun Mukai
1db5397d88 Allow changing mouse pointer icon for the current context. 
Right now, it only supports I-beam on EditText, but further
rules will come in the future.

The png files for the icons are from chromium.

Bug: 24180385
Change-Id: I8de4ec8a5412b4830c08aa232c5083841c5c751c
 2015-10-15 01:47:29 -07:00
Seigo Nonaka
2d04780803 Remove MinikinSkiaFont::GetGlyph. 
MinikinSkiaFont::GetGlyph is no longer used and MinikinFont:GetGlyph
interface is removed by I13398503841ac06f930b04815017d4b33338efa1.
No behavior chnages are expected with this CL.

Change-Id: I8496aad446c6809f74a5effc7ef1baa25c4381b8
 2015-10-15 02:52:38 +00:00
Roozbeh Pournader
97c9c48495 am f12a7499: am 9407aa7c: am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit 'f12a7499dee29904ef15d4f7f9ef60e0ebc4c341':
  Load binary hyphen data files
 2015-10-15 00:31:44 +00:00
Roozbeh Pournader
9407aa7cf0 am 63aa02e4: Merge "Load binary hyphen data files" into mnc-dr-dev 
* commit '63aa02e47fa0fdd877b9fde7f1f6eda75b645f92':
  Load binary hyphen data files
 2015-10-15 00:22:43 +00:00
Raph Levien
35e026929b Load binary hyphen data files 
Support for loading the pre-compiled binary format for hyphenation
patterns.

Bug: 21562869
Bug: 21826930
Bug: 24570591
Change-Id: Iaeaa9c9ac9dac236af6b0d7894c2e2396bc8447d
(cherry picked from commit 091dba2de1e5fa7d4db9f8ccbf1f86e5825d0f52)
 2015-10-14 19:11:33 +00:00
Chris Craik
a44cd33b98 Use FastJNI for trivial MotionEvent native methods 
Change-Id: I4f1b1ee913e994808986fc177da5857c902f8976
 2015-10-13 09:33:58 -07:00
Adam Lesinski
4ffea4e4da am d0c806b1: am 6029dfa8: am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory" 
* commit 'd0c806b10c8e45dcfa950adc36742b15edababea':
  Make 'idmap --scan' accept more than one input directory
 2015-10-13 01:24:16 +00:00
Adam Lesinski
6029dfa81a am 7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory" 
* commit '7caa8f14a78d279e0392089dca2f54f27e7f5d15':
  Make 'idmap --scan' accept more than one input directory
 2015-10-12 18:59:03 +00:00
Mårten Kongstad
83ab0d7c18 Make 'idmap --scan' accept more than one input directory 
The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.

Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
 2015-10-07 19:45:09 +02:00
Pablo Ceballos
a4d4e82927 Remove GLTrace support 
GLTrace is defunct, it does not support newer GL features, breaks
security requirements, and has no supported tooling now that Eclipse
is at end of life.

Bug 22329852

Change-Id: I64c58464f8c2c7ae6125f5d5c7884e3fd34d68ea
 2015-10-06 15:18:40 -07:00
John Reck
0dba1f6114 FastJNI canvas 
Change-Id: Iae33a4785e52efe6f8bbe5bee258f4df830feceb
 2015-10-05 12:14:23 -07:00