Derek Sollenberger
55f4445013
Merge "Add ninePatch support to Canvas.h"
2015-08-19 13:10:40 +00:00
Chris Craik
93481f08b0
am 7da9d7fa: am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
...
* commit '7da9d7fae673473a3a24d3ff0127bd0c67f70337':
Constrain drawBitmap matrix-to-rect optimization
2015-08-19 02:22:33 +00:00
Chris Craik
7da9d7fae6
am 9c45aa8f: am ca3c865d: am 892768fb: am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
...
* commit '9c45aa8f0db8e3c5370172018e162b7ecaf9ea4a':
Constrain drawBitmap matrix-to-rect optimization
2015-08-19 01:43:41 +00:00
Chris Craik
892768fb3e
am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
...
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
Constrain drawBitmap matrix-to-rect optimization
2015-08-19 00:54:00 +00:00
Chris Craik
e688bf7203
Constrain drawBitmap matrix-to-rect optimization
...
bug:22962165
Optimization is not valid if matrix would flip image.
Change-Id: Ieee42390517bd3466b7d94596f0fbbe192ab757e
2015-08-18 14:53:47 -07:00
Derek Sollenberger
4c5efe9290
Add ninePatch support to Canvas.h
...
Change-Id: Ic095291fe55911c6501c1bdefa4b8da973c77319
2015-08-18 15:32:57 -04:00
John Reck
773bbe0357
Revert "Add ninePatch support to Canvas.h"
...
This reverts commit edca320a2b42011f98c308fdf25fc0494c6a5454.
Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
2015-08-17 15:24:09 -07:00
John Reck
d2e7214179
Makefile re-jiggering
...
Change-Id: I6a8d7c9ecbc4f1af8bc4a6e1409787f215d6fc5b
2015-08-17 13:29:10 -07:00
Derek Sollenberger
deead00082
Merge "Add ninePatch support to Canvas.h"
2015-08-17 17:20:55 +00:00
Chris Craik
31710114ba
Merge "Make the value for shadowRadius less than 1.0 work"
2015-08-17 16:37:36 +00:00
Derek Sollenberger
3c9edc9fae
Merge "Cleanup unused param in RenderNode::computeOrdering"
2015-08-17 12:44:06 +00:00
huanhuan.x.wang
a46ca5ec73
Make the value for shadowRadius less than 1.0 work
...
bug:22806069
Shadow effect is not visible if the shadowRadius is set
between 0.1 and 1.0.
Cherry-pick of 8d9b5fbd from AOSP
Change-Id: Ifff71f44d66ba604bd751bb1df96a9904ae7998e
2015-08-14 22:47:47 +00:00
Dan Albert
344e838d22
am 598319d0: am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."
...
* commit '598319d01743427aa67faf4f54ae6d837c8c6d2e':
Fix mismatched new[]/delete.
2015-08-14 21:49:13 +00:00
Dan Albert
598319d017
am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete."
...
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
Fix mismatched new[]/delete.
2015-08-14 21:43:19 +00:00
John Reck
d6d6843aaa
Remove unneeded main.cpp
...
BUILD_NATIVE_TEST actually includes
a main, so this is potentially conflicting
Change-Id: Ic1e60ab3c005417e8aef3d3521409ea034616764
2015-08-14 14:34:17 -07:00
Dan Albert
8dc8313c3e
Fix mismatched new[]/delete.
...
The new clang will emit a warning for this.
Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
2015-08-14 14:12:29 -07:00
Derek Sollenberger
f293259c0d
Cleanup unused param in RenderNode::computeOrdering
...
Change-Id: I4012ac7fce446770c5619dc149f6d62741237fc2
2015-08-14 15:11:23 -04:00
Derek Sollenberger
edca320a2b
Add ninePatch support to Canvas.h
...
Change-Id: Ib3202fd7c5b9f35853f286abe84b3ed009df1a81
2015-08-14 14:59:37 -04:00
John Reck
25f8da9b6a
Merge "Support new EGL extensions"
2015-08-13 15:26:55 +00:00
Andreas Gampe
ea30eb29f8
Hwui: Remove unused variables
...
For build-system CFLAGS clean-up, remove unused variables.
Bug: 18632512
(cherry picked from commit cb4af9b10ab17187288d8f5ccb4cc1e465be9a51)
Change-Id: Ic58bedc84234325512193991fc64315e3aad6f9e
2015-08-12 18:05:35 -07:00
Elliott Hughes
4c807349bd
am 344d347a: am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
...
* commit '344d347af22705aa2fa80602d27a5682a72b5f69':
Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 23:56:18 +00:00
Elliott Hughes
344d347af2
am 39669d7f: am 6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
...
* commit '39669d7f6b8fedef3468ab3d417c93a21df528af':
Lose HAVE_ANDROID_OS from frameworks/base.
2015-08-12 23:28:30 +00:00
Elliott Hughes
ba3fe56edc
Lose HAVE_ANDROID_OS from frameworks/base.
...
Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
2015-08-12 14:49:53 -07:00
John Reck
149173d28c
Support new EGL extensions
...
Bug: 21753739
Includes a revert of 13d1b4ab10fbee5e81a2ba1ac59cfae1e51d3ef0
as that only supported EGL_EXT_buffer_age
Change-Id: Ia86a47d19e3355c067934d7764c330b640c6958d
2015-08-12 14:26:05 -07:00
John Reck
c128823940
Fix bug in calculating perspective damage
...
Change-Id: Iacab98cf3525f891012087acf85e4205b5e8f0d0
2015-08-12 13:52:01 -07:00
Filip Gruszczynski
2349332f9f
Only relaunch activity on significant size configuration changes.
...
Currently if the configuration width/height/smallest width changes, we
relaunch the activity or invoke onConfigurationChanged callback. When it
comes to size based configuration changes it might not be necessary: if
the size change doesn't pass one of the threshold defined by the
resources, it means there is no need to relaunch the activity.
In this CL the ActivityManager will receive the thresholds from the
application and use them to decide, whether to relaunch the activity.
The application reads the thresholds from the resources, specifically
from resource qualifiers used by the app.
Change-Id: Ie3cf0a172dc1ba0b865cf30c2962e7cfd9ad8436
2015-08-10 13:47:31 -07:00
Ben Wagner
60126efd7d
Use unique_ptr instead of SkAutoTDelete.
...
Skia would like to make SkAutoTDelete private, given that unique_ptr
now exists and is a better standard alternative.
Change-Id: Ie21bc4546c93e2096c1e43b26eb3ef80b8f11de4
2015-08-07 17:54:35 -04:00
Yusuke Sato
3a4d02220f
am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
...
* commit '61234deafe78ded05569edfab24536cdb4bd7720':
Clean up AssetManager::scanAndMergeZipLocked
2015-08-06 01:40:24 +00:00
Yusuke Sato
bd4c482be9
Merge "Clean up AssetManager::scanAndMergeZipLocked"
2015-08-05 22:15:50 +00:00
Yusuke Sato
fa451e3776
am 5387f60b: Merge "Fix build breakage caused by r.android.com/162907" into mnc-dr-dev-plus-aosp
...
* commit '5387f60ba26ae89e31e776202fbf13287dc620a8':
Fix build breakage caused by r.android.com/162907
2015-08-05 20:44:58 +00:00
Yusuke Sato
6120883971
am 3251f2aa: am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
...
* commit '3251f2aab75c8c905cc59b428d99812b5575ebdb':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
2015-08-05 20:36:43 +00:00
Yusuke Sato
ead2088efe
Fix build breakage caused by r.android.com/162907
...
Change-Id: Ifeb7b57ce79f3d8c0edadf03d14853e72840d49e
2015-08-05 13:14:53 -07:00
Yusuke Sato
3251f2aab7
am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
...
* commit '3383b141c3ac4426279e649ebcee535890203c3f':
Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files
2015-08-05 19:09:41 +00:00
Yusuke Sato
a024acb8ba
Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
2015-08-05 17:46:18 +00:00
John Reck
d56554e82b
am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
...
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
animateNoDamage failed to remove from current frame list
2015-08-04 21:13:23 +00:00
John Reck
016e0091d6
am b47ea9b2: am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
...
* commit 'b47ea9b2ed24f8eb6fc8b338555ff0d8825d8565':
hwui: add extension to support unpack operations in OpenGL ES 2.0
2015-08-04 21:00:09 +00:00
John Reck
0aee76c303
Merge "renderthread: add EGL_EXT_buffer_age support"
2015-08-04 20:54:20 +00:00
John Reck
bc04d3acba
Merge "animateNoDamage failed to remove from current frame list"
2015-08-04 20:52:40 +00:00
John Reck
b47ea9b2ed
am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
...
* commit '2fa3eec0e1807f6a45b71a41624698e8cc949026':
hwui: add extension to support unpack operations in OpenGL ES 2.0
2015-08-04 20:51:42 +00:00
John Reck
9acd09d364
am 598b0123: am 67716c13: am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
...
* commit '598b0123d322b396e8bfc3d66f228cf0b7485eac':
Fix crash in kModeProcessNoContext
2015-08-04 20:20:41 +00:00
John Reck
598b0123d3
am 67716c13: am e28c5d62: am a975a844: am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
...
* commit '67716c13939f92cf1de2404e47c569ddf92ee96a':
Fix crash in kModeProcessNoContext
2015-08-04 20:13:07 +00:00
Season Li
13d1b4ab10
renderthread: add EGL_EXT_buffer_age support
...
EGL_EXT_buffer_age is better than EGL_BUFFER_PRESERVED
because it can save memory bandwidth used to blit
back buffer into front buffer.
Change-Id: I2fea0ee08dc7dd66e348b04dd694d075d509d01b
2015-08-04 13:01:54 -07:00
John Reck
a975a84498
am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
...
* commit '70e5db9413f82bf1f000bd99b3d2dbecf6e4ab04':
Fix crash in kModeProcessNoContext
2015-08-04 19:48:30 +00:00
John Reck
95cd24bb9d
Fix crash in kModeProcessNoContext
...
Bug: 22931143
Change-Id: I9897a28b1edd006aee67ae2343874ad92bbd15a0
2015-08-04 18:19:11 +00:00
Ben Wagner
a11ee3c413
Add Skia includes where needed.
...
A proposed change in Skia will forward declare more classes in more
headers. As a result, some Skia headers need to be explicitly
included.
Change-Id: I577095afde9de0e36b8f904aee91979b01e30726
2015-08-04 17:28:43 +00:00
Ye Ouyang
68eb3b22b0
animateNoDamage failed to remove from current frame list
...
runRemainingAnimations is used to animate the available animation handle
which were not yet run, it actually animate those animation handle and
removes from the list by notifyAnimationsRan(). In case if these animation
handles are not removed, it leads to the Fatal Assert of runRemainingAnimations.
Some usecases causes the addition of animation handle when there is
no animators, in these cases this check prevents execution of
notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations.
Allowing the animation to happen irrespective of animators solves the problem.
Change-Id: Ifa72286cdc6ff785fcc999f3b951dd787e7003e9
2015-08-04 10:42:32 -05:00
xiaozhengdong
d538d30e2f
hwui: add extension to support unpack operations in OpenGL ES 2.0
...
OpenGL ES 3.0+ lets us specify the row length for unpack operations
such as glTexSubImage2D(). This allows us to upload a sub-rectangle
of a texture. Also, the GL_EXT_unpack_subimage extension can also
support this feature in OpenGL ES 2.0
Change-Id: Id43c2c55c5eaefbace67087c955f0b4324fb2c35
Signed-off-by: xiaozhengdong <xiaozhengdong@xiaomi.com>
2015-08-04 19:46:01 +08:00
John Reck
0d39408976
am 903e117e: am 0429246e: am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
...
* commit '903e117e55d5b2ac58acdce3810fc47972d1c6cb':
Disable skipping frames on empty damage
2015-08-04 01:41:02 +00:00
John Reck
903e117e55
am 0429246e: am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
...
* commit '0429246eb85dd3c42f92bd5680fe2f6883faddbc':
Disable skipping frames on empty damage
2015-08-04 01:31:03 +00:00
John Reck
2e529712e6
am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
...
* commit 'c03ab87ac9f721ff22bfe5e9c0cd0e5be64f261e':
Disable skipping frames on empty damage
2015-08-04 01:00:24 +00:00