9861 Commits

Author SHA1 Message Date
TreeHugger Robot
de037ad4ff Merge "Stop calling SkBitmap::setHasHardwareMipMap" 2018-11-06 01:25:30 +00:00
Ryan Mitchell
3064067908 Merge "Copy common resources between styles" 2018-11-05 23:56:39 +00:00
Leon Scroggins III
ddd2c0b98b Stop calling SkBitmap::setHasHardwareMipMap
Test: mmma -j frameworks/base/libs/hwui
      mmma -j frameworks/base/core/jni/

No one ever calls SkBitmap::hasHardwareMipMap, so there is no reason to
set it.

Change-Id: I5f7aec5353fbb38c83ef7f66e14f65f1a560558f
2018-11-05 16:56:27 -05:00
John Reck
f2c351abb4 Merge "Make RenderNode public API" 2018-11-05 20:54:57 +00:00
Colin Cross
44f74d111f Merge changes from topic "protobuf3.5.2" am: 1d899f6be8 am: 11a4d77516
am: c836696a92

Change-Id: I158185738327cee8f501dcba7e85de66240eaf42
2018-11-04 18:39:37 -08:00
Colin Cross
c836696a92 Merge changes from topic "protobuf3.5.2" am: 1d899f6be8
am: 11a4d77516

Change-Id: I6ad3772bc16f236c2c5e7ba381593b10292aabde
2018-11-04 18:13:52 -08:00
Colin Cross
1d899f6be8 Merge changes from topic "protobuf3.5.2"
* changes:
  Adapt to google::protobuf::uint64 type change
  Convert statsd_test and statsd_benchmark to proto lite
2018-11-05 01:13:15 +00:00
Elliott Hughes
1ae0309d24 Merge "Track google-benchmark API changes." am: 9a8757ded5 am: b55d843217
am: 0782a629aa

Change-Id: I55ed562a571304850b7c896fc11108001c1a2666
2018-11-02 22:59:20 -07:00
Elliott Hughes
0782a629aa Merge "Track google-benchmark API changes." am: 9a8757ded5
am: b55d843217

Change-Id: Ia1f1454a91cd22aa1263cbdcc00adf90b511f935
2018-11-02 22:40:46 -07:00
Treehugger Robot
9a8757ded5 Merge "Track google-benchmark API changes." 2018-11-03 05:11:09 +00:00
John Reck
ddeaa487da Make RenderNode public API
Bug: 112709971
Test: CtsUiRenderingTestCases:.testclasses.RenderNodeTests
Change-Id: I57d64165b842d03565eda5f4d37343c4f9c45d42
2018-11-02 14:24:32 -07:00
Colin Cross
fa6bc27df0 Adapt to google::protobuf::uint64 type change
Protobuf 3.5.2 redefines google::protobuf::uint64 from unsigned long
long to uint64_t, which is sometimes unsigned long and sometimes
unsigned long long.  Use PRIu64 to print it, and add an implementation
of ProtoOutputStream::write for long.

Bug: 117607748
Test: m checkbuild
Change-Id: I48912f58e2f63f4a98c3aefaa4f78cc2c719bb68
2018-11-02 11:35:48 -07:00
Ryan Mitchell
b3ae42e976 Copy common resources between styles
The docuemntation of setTo states that the resources two styles from
different AssetManagers have in common will be set in the destination
theme. This change adds this functionality. The package ids of the
attributes, the package ids of reference values, and the cookie of
attribute values have to be rewritten to match the destination
AssetManager. This change can later be made more generic if rewriting
references between packages is needed elsewhere.

Bug: 115897657
Test: libandroidfw_tests and manual test of app specified in the bug
Change-Id: Iee999ea2cc8473168cac11aaf3c34e14c958e5ae
2018-11-01 17:01:28 -07:00
Mike Reed
16c142b4b4 move alignment to Paint (from SkPaint)
Test: make

Change-Id: I35633b0a43b68b4784d8f253a9c37d1d8da7dc87
2018-11-01 12:43:53 -04:00
Colin Cross
bd26d4363f Convert statsd and incidentd to Android.bp
am: 05c9e5c24a

Change-Id: Ic5b6353777baf66eb77f7fc6b9846fa4adbca186
2018-10-31 14:12:36 -07:00
Colin Cross
05c9e5c24a Convert statsd and incidentd to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Merged-In: I8c80878cec46c9299234c6f4c1e0e19efc0a221e
Change-Id: I8c80878cec46c9299234c6f4c1e0e19efc0a221e
2018-10-31 08:01:59 -07:00
Colin Cross
b7fddfc6a6 Merge "Convert statsd and incidentd to Android.bp" 2018-10-30 23:28:28 +00:00
Colin Cross
bc2dc31c4d Convert statsd and incidentd to Android.bp
See build/soong/README.md for more information.

Fixes: 110563449
Test: m checkbuild
Change-Id: I8c80878cec46c9299234c6f4c1e0e19efc0a221e
2018-10-30 13:30:23 -07:00
Stan Iliev
f071820f78 Merge "Use bilerp sampling when drawing TextureView with non-translate matrix" into pi-dev
am: 9dff553798

Change-Id: I3dbea21c751d914d8704ba564c9567029216450c
2018-10-30 11:56:21 -07:00
Elliott Hughes
a06d5174df Track google-benchmark API changes.
Bug: N/A
Test: builds
Change-Id: I126734361d367529a8175aff6cc10fc426b39e1a
2018-10-30 10:12:57 -07:00
TreeHugger Robot
c6d5e2db6b Merge "Remove SyncFeatures usage from VulkanManager" 2018-10-29 16:58:40 +00:00
Stan Iliev
7a08127e88 Remove SyncFeatures usage from VulkanManager
SyncFeatures is implemented by quering available EGL extensions.
For Vulkan we assume these features are present. SyncFeatures
is crashing for Vulkan, because EGL is not initialized.

Test: TextureViewCameraTest#testTextureViewActivity is passing
Bug: 116117654
Change-Id: I57e6ce1c0f00c1b073d0a2ab2695d9fbecfd2b33
2018-10-26 21:58:50 +00:00
TreeHugger Robot
3fb3ac1ab2 Merge "Keep file path used to create SkTypeface in MinikinFontSkia" 2018-10-26 04:12:51 +00:00
Android Build Merger (Role)
f4b1dba764 Merge "Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d am: 469705cca4" 2018-10-26 00:58:44 +00:00
Chih-hung Hsieh
51025d638d Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d
am: 469705cca4

Change-Id: I4bc5f389495ed535762438632e65ccd6c66f3739
2018-10-25 17:58:17 -07:00
Seigo Nonaka
54c6a2722b Keep file path used to create SkTypeface in MinikinFontSkia
This is a ground work for the itemize API. The file path will be the
output of the itemize API.

Bug: 114479228
Test: minikin_tests
Test: hwui_unit_tests (only tested on 32bit. couldn't test 64bit)
Change-Id: I70252594889175bf5fa0013bbaa95c6c87ca5680
2018-10-25 22:49:04 +00:00
John Reck
5711911bd3 Enable smart dark
Bug: 116860870
Test: builds, smart dark applies for targetSdk >= Q && night mode is
enabled
Change-Id: I66e4ec4ad3e5c886c5260137fd48e2c92ee59552
2018-10-25 15:25:51 -07:00
Stan Iliev
402fff1259 Use bilerp sampling when drawing TextureView with non-translate matrix
Draw TextureView with bilerp sampling, when the matrix is not
integer translate or identity. For example scaling matrix or
translation on X by 0.4f will draw with GL_LINEAR on OpenGL pipeline.
Translation on X by 3.0f will draw TextureView with GL_NEAREST.

Bug: 117890671
Test: Passed CtsViewTestCases and CtsUiRenderingTestCases
Change-Id: I72033410c8b0ab637c2e6b816ac9b04434286fbb
Merged-In: I3acd710ff2cb4ee7b14dd4b7d9227842187130c9
2018-10-25 16:28:27 -04:00
Chih-hung Hsieh
469705cca4 Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64
am: 9c5738238d

Change-Id: I0a8803682ec00a85583bb82e0505335318571a2d
2018-10-24 15:24:23 -07:00
Chih-Hung Hsieh
bd0093e182 Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83
am: a6c90c99cd

Change-Id: I5efd04bf9dae335e03181b6443a3a85e69c1c042
2018-10-24 14:19:26 -07:00
Stan Iliev
aa0a33180e Use bilerp sampling when drawing TextureView with non-translate matrix
Draw TextureView with bilerp sampling, when the matrix is not
integer translate or identity. For example scaling matrix or
translation on X by 0.4f will draw with GL_LINEAR on OpenGL pipeline.
Translation on X by 3.0f will draw TextureView with GL_NEAREST.

Bug: 117890671
Test: ran camera app
Change-Id: I3acd710ff2cb4ee7b14dd4b7d9227842187130c9
2018-10-23 20:37:44 +00:00
Chih-hung Hsieh
9c5738238d Merge "Allow implicit-fallthrough warnings locally."
am: 36afe11a64

Change-Id: Ib185af9f85059f19cfd502b87bb6179d0d37ade7
2018-10-22 15:54:52 -07:00
Chih-Hung Hsieh
e1afb6cb29 Allow implicit-fallthrough warnings locally.
It will be a global error by default.
Cherry pick lost changes from AOSP, for Android.mk and main.cpp.

Test: make checkbuild
Bug: 112564944
Change-Id: I6f1024fa5e31302af27fa9d5bac195e511f4ba20
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-22 12:25:50 -07:00
Chih-Hung Hsieh
e8abd06776 Allow implicit-fallthrough warnings locally.
It will be a global error by default.

Test: make checkbuild
Bug: 112564944
Change-Id: I26616fd50ccf3639fa7c01d850a14d079273ede7
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-22 09:56:12 -07:00
Mike Reed
474fcc44de remove reference to skia vertical-text (never set/used)
Test: make

See https://bugs.chromium.org/p/skia/issues/detail?id=8487

Change-Id: I185ffb3251aa154da55b0615f5837d9d090e5963
2018-10-22 14:56:04 +00:00
Treehugger Robot
46049f5fec Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." 2018-10-20 01:08:55 +00:00
Treehugger Robot
8f520e6f83 Merge "Fix implicit-fallthrough warnings." 2018-10-20 00:15:20 +00:00
Chih-Hung Hsieh
df891f8a31 Fix implicit-fallthrough warnings. DO NOT MERGE.
These changes are not needed in goog/master.

Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c
2018-10-19 15:32:26 -07:00
Chih-Hung Hsieh
672a4fd863 Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505
2018-10-19 14:19:29 -07:00
Tim Murray
e0b5e846f8 hwui: purge malloc pages on bitmap destruction
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.

Test: boots and works
bug 117795621

Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-19 02:31:07 +00:00
Tim Murray
64fee6148b hwui: purge malloc pages on bitmap destruction
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.

Test: boots and works
bug 117795621

Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-18 23:30:35 +00:00
Tim Murray
535fae32e5 hwui: purge malloc pages on bitmap destruction
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.

Test: boots and works
bug 117795621

Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-18 23:26:10 +00:00
Derek Sollenberger
e65e6c0d7c Merge "Remove unused classes from HWUI." 2018-10-18 16:43:11 +00:00
Ryan Prichard
559dbd88c7 Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3 am: a34a1e0c97
am: 498357670e

Change-Id: I4fe5a70c750328bb67cdc02a08e4f9eeb97ac20d
2018-10-15 22:05:59 -07:00
Ryan Prichard
498357670e Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3
am: a34a1e0c97

Change-Id: Icf0d62124d88c87a76edcb9af945a2f327989a15
2018-10-15 21:25:35 -07:00
Ryan Prichard
a34a1e0c97 Merge "Change ZipArchiveHandle from void* to ZipArchive*"
am: f79542efd3

Change-Id: Iebca19f2757ae77c07eca46a721c6966621fea14
2018-10-15 19:06:02 -07:00
Ryan Prichard
3addcd3965 Change ZipArchiveHandle from void* to ZipArchive*
Bug: none
Test: m checkbuild
Exempt-From-Owner-Approval: owner is OOO for another week,
  it's a fairly minor change to this repository
Change-Id: If4cf57619034ab98b06115ca60beb2fb26c4cd19
2018-10-15 23:22:47 +00:00
Mike Reed
d0a615624c delete tests for deprecated isABitmap
This check is also no longer needed
- no limit on colorshaders

Test: make

Change-Id: I088ec0eae3fb792b36eaec37e5b3f29bbbf573f9
2018-10-15 12:30:57 -04:00
Mårten Kongstad
62f3415ea6 Merge "libandroidfw: introduce ExecuteBinary (POSIX only)" am: 120b7fba93 am: 2a656b455d
am: dcef167772

Change-Id: I751a22f6610a103a32bbbb6925e12e5db6e4ca60
2018-10-10 19:12:19 -07:00
Todd Kennedy
8a98b40cc0 Merge "Merge commit 'c5e694e9549da3911392abd01bae125444f56294' into manual_merge_c5e694e9549da3911392abd01bae125444f56294" 2018-10-11 01:25:16 +00:00