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

6783 Commits

Author SHA1 Message Date
Derek Sollenberger
6e03543f63 Add transitive dependency to enable refactoring within Skia 
Change-Id: Iaf9841a2f74f927bb7aac6bbc9fc3cdfe0312fd5
 2015-08-20 16:12:01 -04:00
Chris Craik
1858541add Merge "Define GLSL version" 2015-08-20 19:58:08 +00:00
Ben Wagner
b03198de9f Merge "Use static_assert instead of SK_COMPILE_ASSERT." 2015-08-20 14:56:10 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path" 
This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
 2015-08-20 02:23:39 +00:00
Chris Craik
87f9c42f54 Merge "Simplify TextureView draw path" 2015-08-20 00:02:09 +00:00
Chris Craik
20a248934c Simplify TextureView draw path 
bug:20461288

Change-Id: I239fbd26ab2177481c84feb62a1da68faeb634ac
 2015-08-19 16:59:45 -07:00
Chris Craik
f2dc936a90 Merge "Remove MathUtils::min/max" 2015-08-19 23:09:54 +00:00
Chris Craik
9db58c031f Remove MathUtils::min/max 
bug:22202895

Change-Id: Ia115d86871314e3819f684ea7307356aed13a28e
 2015-08-19 15:53:01 -07:00
Chris Craik
e5e6f4837b Merge "Change setMatrix behavior to only affect canvas-local matrix" 2015-08-19 22:38:07 +00:00
Chris Craik
8bd68c6b7d Define GLSL version 
bug:21923805

Change-Id: Ie44fb9cf38ef5f19df957e4a639d9c7d47da391e
 2015-08-19 15:29:45 -07:00
Chris Craik
7c85c54499 Remove Matrix4::load(Matrix4&) 
bug:22320446

Change-Id: Id6d1cc9b4aea828b0cdf622ad672064d72671f8d
 2015-08-19 15:10:25 -07:00
Ben Wagner
e3a40ea488 Use static_assert instead of SK_COMPILE_ASSERT. 
Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0
 2015-08-19 17:21:17 -04:00
Chris Craik
6daa13c5fa Change setMatrix behavior to only affect canvas-local matrix 
bug:22189925

This makes setMatrix(getMatrix()) work as expected, and makes setMatrix()
much more useful without changing behavior relative to a View's parent
hierarchy.

Change-Id: I608613bd27c1b9052ae583f8fd2119cf37a2f6d7
 2015-08-19 13:32:15 -07:00
Ben Wagner
283e907af4 Merge "Use 'new' instead of 'SkNEW'." 2015-08-19 19:01:04 +00:00
Derek Sollenberger
45f250aa1f Remove accidentally added old makefile 
Change-Id: Id3966f1458c14b659b1b35437e6620fb8306aa83
 2015-08-19 13:56:08 -04:00
Ben Wagner
d1cbc16089 Use 'new' instead of 'SkNEW'. 
There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.

Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
 2015-08-19 13:04:36 -04:00
Ben Wagner
c091e218af Merge "Remove use of SkAutoSTMalloc from Android." 2015-08-19 15:38:14 +00:00
Ben Wagner
6bbf68d05a Remove use of SkAutoSTMalloc from Android. 
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.

Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
 2015-08-19 11:26:06 -04:00
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