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

6995 Commits

Author SHA1 Message Date
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
fc7f6197cb am 0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev 
* commit '0b8045425ff58f992046ff2be35bc91001dabf7b':
  Constrain drawBitmap matrix-to-rect optimization
 2015-08-19 01:41:25 +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
Chris Craik
e3f0a881c2 Merge "Make the value for shadowRadius less than 1.0 work" 2015-08-14 22:02:19 +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
Dan Albert
f13f1efab2 am 16e5aba9: am 4a2a890b: Merge "Fix mismatched new[]/delete." 
* commit '16e5aba9c8157b3ffdcdceda378896a43f074748':
  Fix mismatched new[]/delete.
 2015-08-14 21:43:16 +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
Andreas Gampe
3255e2f961 Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp 2015-08-12 23:31:25 +00:00
Andreas Gampe
fea85a33b7 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 16:30:32 -07: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
17b4be07fe 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:21:56 +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
e15a5871bd am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked" 
* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked
 2015-08-06 01:39:44 +00:00
Yusuke Sato
bd4c482be9 Merge "Clean up AssetManager::scanAndMergeZipLocked" 2015-08-05 22:15:50 +00:00
Yusuke Sato
c1efd41f3f Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP) 
Change-Id: Icea0ac00c56b5c8aa21134fc49b518cda4759e36
 2015-08-05 14:41:52 -07: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
eb24da62ac 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:05:17 +00:00
Yusuke Sato
a024acb8ba Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files" 2015-08-05 17:46:18 +00:00
John Reck
17dafd6033 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:14:45 +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