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

3173 Commits

Author SHA1 Message Date
Derek Sollenberger
2d5cf4f6db Update framework to enable Skia to run in debug mode. 
Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
 2014-02-20 14:47:54 -05:00
John Reck
a13a69f0e5 Merge "Fix layer recycling for GLRenderer" 2014-02-20 02:37:40 +00:00
John Reck
0b2c8df7a6 Fix layer recycling for GLRenderer 
Bug: 13007905

Change-Id: I1589f2bb14429099e391c03d7dfb1650da145f28
 2014-02-19 18:31:08 -08:00
Dan Stoza
b88a904dfe Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:33 +00:00
John Reck
5efe5a2d35 Merge "Support HardwareLayers in RenderThread" 2014-02-19 18:58:18 +00:00
John Reck
19b6bcfd83 Support HardwareLayers in RenderThread 
Also has a few HardwareLayer lifecycle fixes

Change-Id: I6308cb05f8f199eed72189ace768013a46815941
 2014-02-19 10:47:19 -08:00
Chris Craik
66d792b663 Merge "Make outline and shadow APIs public" 2014-02-19 18:11:46 +00:00
Narayan Kamath
dfc1ef9255 am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '29596ac2baef37de4cfed494cd740de8d1090899':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:37:03 +00:00
Narayan Kamath
41dd75f813 am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:28:56 +00:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00
Chris Craik
e9b8817bd7 Make outline and shadow APIs public 
Change-Id: If40dc27b2fdc41c3ed355bc9029474b1344c1a03
 2014-02-18 16:55:45 -08:00
Leon Scroggins
73c04711ca Remove call to setIsOpaque (again). 
The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a,
since setIsOpaque was deprecated in Skia.

It was accidentally reintroduced in
Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant
with the lines above it (which call the replacement for setIsOpaque,
setAlphaType).

Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
 2014-02-17 10:46:39 -05:00
Dan Stoza
16ec12ae77 Allow disabling layer rotation during screenshots 
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I96e65506b198d34724eb3aa84815aae6f6de4935
 2014-02-14 23:10:29 +00:00
Narayan Kamath
3d03e5b90d Remove java.io.tmpdir assignment in AndroidRuntime. 
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
 2014-02-14 17:42:24 +00:00
Narayan Kamath
ee904d4d3e am 6795e9c7: am 7a66d8ea: am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '6795e9c783242b31188d76c5186dfe0751f1731a':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:23:46 +00:00
Narayan Kamath
7a66d8ea7c am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class" 
* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
 2014-02-14 13:17:13 +00:00
Narayan Kamath
fa8f95e9b9 Merge "AArch64: Use long for pointers in SurfaceSession class" 2014-02-14 13:10:44 +00:00
Andreas Huber
d430354c6b Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."" 2014-02-13 17:22:49 +00:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
 2014-02-13 17:22:33 +00:00
Andreas Huber
04f0cab79d Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 2014-02-13 16:35:03 +00:00
Nick Kralevich
edb03c7d6d am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-13 01:11:47 +00:00
Nick Kralevich
20b5fd98fb am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 23:19:05 +00:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Andreas Huber
7825334929 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. 
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.

Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
 2014-02-12 15:00:05 -08:00
Nick Kralevich
d5c8044e7e resolved conflicts for merge of 1cbea39f to master 
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
 2014-02-12 14:41:25 -08:00
Nick Kralevich
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp 
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
 2014-02-12 11:05:59 -08:00
Derek Sollenberger
ebcf70b128 Merge "Revert "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-12 19:00:46 +00:00
Derek Sollenberger
90d0c75e94 Revert "Refactor setting an SkPaint onto a hwui Layer." 
This reverts commit e889298cd6ae1fc0d76bc00d7d12586db03eb261.

Change-Id: I4b1d609b2d4280595d40cb10d6c18875c22999f8
 2014-02-12 18:59:05 +00:00
Derek Sollenberger
5f97e9e9ed Merge "Refactor setting an SkPaint onto a hwui Layer." 2014-02-12 18:10:21 +00:00
Derek Sollenberger
e889298cd6 Refactor setting an SkPaint onto a hwui Layer. 
This CL removes the unecessary JNI call to set the colorFilter on
a layer.

Change-Id: I9e088f888938d4315745aa618334bfdb9e61343a
 2014-02-12 11:26:06 -05:00
Jean-Michel Trivi
ed8bb0159c Merge "AudioTrack JNI function rename" 2014-02-11 22:38:27 +00:00
Dianne Hackborn
67754d93c4 Merge "Runtime resource overlay, iteration 2" 2014-02-11 21:29:58 +00:00
Michael Wright
0d148c8b4e Merge "Move inputservice over to frameworks/native" 2014-02-11 19:09:12 +00:00
Michael Wright
d6b473713f Move inputservice over to frameworks/native 
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Try 2.

Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
 2014-02-11 10:47:36 -08:00
John Reck
fc53ef2779 Implement missing safelyRun() on ThreadedRenderer 
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
 2014-02-11 10:40:25 -08:00
John Reck
f6eebb21d5 Merge "Refactor HardwareLayer" 2014-02-11 17:30:53 +00:00
Narayan Kamath
faa91f852e am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '86fb9904ad5760cb957782b45e96054c01fe4200':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:40:39 +00:00
Narayan Kamath
a1cffb429c am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:40:27 +00:00
Narayan Kamath
86fb9904ad am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" 
* commit '8a63c34bb0f0cf25051c6eeb49c21476258fadfb':
  Use long to store pointers in GLES_JNI/EGL classes
 2014-02-11 16:34:16 +00:00
Narayan Kamath
d350af9695 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument" 
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
 2014-02-11 16:34:04 +00:00
Narayan Kamath
3aeb629d82 Merge "Use long to store pointers in GLES_JNI/EGL classes" 2014-02-11 15:39:04 +00:00
Narayan Kamath
f44a3f1e00 Merge "Use long for pointers in EmojiFactory and PdfDocument" 2014-02-11 14:07:17 +00:00
John Reck
04fc583c3d Refactor HardwareLayer 
Defer all the things!
 Groundwork to allow hardware layers to work in a renderthread world

Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
 2014-02-10 20:55:39 -08:00
Michael Wright
f52fd37826 Merge "Revert "Move inputservice over to frameworks/native"" 2014-02-10 23:09:45 +00:00
Michael Wright
453fa30ab2 Revert "Move inputservice over to frameworks/native" 
This reverts commit 89e5c7ebb37fabc4368e87e17a502db62598bd61.
 2014-02-10 15:08:26 -08:00
Michael Wright
740dfefcfc Merge "Move inputservice over to frameworks/native" 2014-02-10 22:42:01 +00:00
Colin Cross
e7755a0d25 am 675d44ad: am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '675d44ad2355eb4404e286f2c337196297d1e26f':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 22:14:53 +00:00
Michael Wright
89e5c7ebb3 Move inputservice over to frameworks/native 
Remove all of the pieces except the PointerController and SpriteController over
to frameworks/native in preparation for inputflinger. Those two need to stay in
frameworks/base for now because they depend on Skia currently. In the long run
they should be merged into either the InputManager or the WindowManager rather
than as a part of the inputservice / inputflinger.

Change-Id: Iebef71f3030fb3d26a5f338eb66d75bb37c17734
 2014-02-10 14:10:27 -08:00
Colin Cross
675d44ad23 am 12f1f5b8: am 40545f32: Merge "frameworks/base: fix errors inside ALOGV" 
* commit '12f1f5b87326a31f4c69e949a1e645e82c9152d4':
  frameworks/base: fix errors inside ALOGV
 2014-02-10 22:09:12 +00:00
Leon Scroggins III
3393f390a5 Merge "Decode file descriptor from the correct offset." 2014-02-10 20:30:50 +00:00