OSDN Git Service
Hugo Benichi [Thu, 13 Oct 2016 00:26:01 +0000 (09:26 +0900)]
ApfFilter: systematically use u8, u16, u32 getters
This patch adds a getUint8 getter for ByteBuffers and changes ApfFilter
to make uses of getUint8/16/32 everywhere.
The return types of getUint16 is also changed from long to int, which
will expand gracefully to long as an unsigned int as it is guaranteed to
be positive after getUint16.
Test: ApfTest passes
Change-Id: Id3c2817b949e9817e2bb60e0ec8fe2d6fd8d787c
Selim Cinek [Thu, 13 Oct 2016 01:00:53 +0000 (01:00 +0000)]
Fixed an issue where the emergency affordance would show am:
bd740cd56a am:
c46b2ef8d2
am:
7356abc6f4
Change-Id: Ic29aee94a544d5ec028edd4640ec58a2cb10c321
Selim Cinek [Thu, 13 Oct 2016 00:53:56 +0000 (00:53 +0000)]
Fixed an issue where the emergency affordance would show am:
bd740cd56a
am:
c46b2ef8d2
Change-Id: Ice913b2ace0dc3962cd3b048ba847f4050c29cce
Selim Cinek [Thu, 13 Oct 2016 00:41:24 +0000 (00:41 +0000)]
Fixed an issue where the emergency affordance would show
am:
bd740cd56a
Change-Id: I6ce705cc701bf149dec45feabcf4777cc89afa6a
Adrian Roos [Wed, 12 Oct 2016 23:34:01 +0000 (23:34 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev am:
5c8fc58850 am:
b920d48e0a
am:
85d2112335
Change-Id: I696985c99ff0053bbe78533fc4d13e71566cf5a4
Adrian Roos [Wed, 12 Oct 2016 23:33:11 +0000 (23:33 +0000)]
Fix Notification.Action.Builder copy constructor am:
7af5362571 am:
342bc437bf
am:
7bc84b803d
Change-Id: Ice60b61b4868d775b04423e7166182db382d28b2
Adrian Roos [Wed, 12 Oct 2016 23:26:15 +0000 (23:26 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev am:
5c8fc58850
am:
b920d48e0a
Change-Id: Ie7d699fa304be1b75e7037d75c02ab5302a3205d
Adrian Roos [Wed, 12 Oct 2016 23:25:20 +0000 (23:25 +0000)]
Fix Notification.Action.Builder copy constructor am:
7af5362571
am:
342bc437bf
Change-Id: I0387ab66ec3d44e34a884fb2f92f32af35e2883c
Adrian Roos [Wed, 12 Oct 2016 23:19:22 +0000 (23:19 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
am:
5c8fc58850
Change-Id: Ic9b035247f5b09582adf20c7cb47361f7b035cf7
Adrian Roos [Wed, 12 Oct 2016 23:19:19 +0000 (23:19 +0000)]
Fix Notification.Action.Builder copy constructor
am:
7af5362571
Change-Id: I0853e663b1895e2c45fad17cfee79202f3b14ef7
TreeHugger Robot [Wed, 12 Oct 2016 23:12:15 +0000 (23:12 +0000)]
Merge "Fatal abort on invalid state"
TreeHugger Robot [Wed, 12 Oct 2016 23:11:20 +0000 (23:11 +0000)]
Merge "Fix Notification.Action.Builder copy constructor" into nyc-mr1-dev
TreeHugger Robot [Wed, 12 Oct 2016 23:07:54 +0000 (23:07 +0000)]
Merge "Dreams: Fix lockscreen flicker"
Adrian Roos [Wed, 12 Oct 2016 20:44:05 +0000 (13:44 -0700)]
Fix Notification.Action.Builder copy constructor
The copy constructor of Notification.Action.Builder did not copy
the mAllowGeneratedReplies field.
Change-Id: I40fbe8950ee2232e2589ab3930a32bfbebe9fc89
Fixes:
31766718
Test: runtest --path $T/cts/tests/app/src/android/app/cts/NotificationTest.java
Romain Guy [Wed, 12 Oct 2016 22:17:07 +0000 (22:17 +0000)]
Merge "Various fixes for linear blending and gradients"
TreeHugger Robot [Wed, 12 Oct 2016 21:58:08 +0000 (21:58 +0000)]
Merge "Enable Checkstyle preupload hook for certain frameworks/base directories."
Salvador Martinez [Wed, 12 Oct 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Restricted switch preference uses ripple on focus"
TreeHugger Robot [Wed, 12 Oct 2016 21:31:53 +0000 (21:31 +0000)]
Merge "Fix import statement in view|transition|animation packages."
John Reck [Wed, 12 Oct 2016 21:08:49 +0000 (14:08 -0700)]
Fatal abort on invalid state
Use mCaches.size() to track item count instead of trying
to do it manually on the side.
Bug:
31856965
Test: manual, minimal. Repro steps for bug are unknown, fix
is speculative as a result
Change-Id: Ic32f27262548a99be95440881420d224ede4db74
Adrian Roos [Wed, 12 Oct 2016 19:03:24 +0000 (12:03 -0700)]
Dreams: Fix lockscreen flicker
Fixes a bug where dreams (and other SHOW_WHEN_LOCKED activites) would
show a flicker of the lockscreen when the device locked while they are
showing.
This was caused because the lockscreen drives locking the device by
making itself expand, but does not immediately know that it should hide
itself because the occluded state is only pushed when the lockscreen is
showing.
To fix this, we simply push the occluded state also when the device
isn't locked - that way, the status bar can go into the appropriate
state immediately upon locking.
Change-Id: Ie03bfcfe902fc562d76a773d3fc3371359f63563
Fixes:
29555358
Test: adb shell am start -n com.android.systemui/.Somnambulator
Adam Lesinski [Wed, 12 Oct 2016 21:16:58 +0000 (21:16 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev am:
baac85ec1f am:
cde80e68c6
am:
baee508ba9
Change-Id: Ib401377b8dfb5d423e0b249bc818e953d78fc752
Martin Wallgren [Wed, 12 Oct 2016 21:15:58 +0000 (21:15 +0000)]
RRO: Synchronize access to overlays.list am:
0fbb608110 am:
dce79f10ba
am:
3970c44547
Change-Id: I4c9eecad4c2d935a1f1840fed6d70685b82b7e65
Doris Liu [Wed, 12 Oct 2016 21:11:54 +0000 (21:11 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am:
269f76a7d2 am:
64d24d6631
am:
d3725ee017
Change-Id: I54c6cf0b207c83eb647550199572b21be6504973
Doris Liu [Wed, 12 Oct 2016 21:10:47 +0000 (21:10 +0000)]
Fix SkShader leak for Gradient VectorDrawable and test am:
fc9cf72339 am:
c47199bb6a
am:
1ef744a3b8
Change-Id: Iee4f98f10a4e1b3947166777040918ab779ab023
Adam Lesinski [Wed, 12 Oct 2016 21:10:41 +0000 (21:10 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev am:
baac85ec1f
am:
cde80e68c6
Change-Id: I445fb76e38d34e2df74ff61cfd4b1ce6166a7265
Martin Wallgren [Wed, 12 Oct 2016 21:09:42 +0000 (21:09 +0000)]
RRO: Synchronize access to overlays.list am:
0fbb608110
am:
dce79f10ba
Change-Id: Idc121ffe64f1bc7b5bdcb1a800305165f27f1c0a
Doris Liu [Wed, 12 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev am:
269f76a7d2
am:
64d24d6631
Change-Id: Id6964ab08d4443a3ad4932a9ed25751c922a411a
Doris Liu [Wed, 12 Oct 2016 21:03:14 +0000 (21:03 +0000)]
Fix SkShader leak for Gradient VectorDrawable and test am:
fc9cf72339
am:
c47199bb6a
Change-Id: I261f8f3708f526c15ae93c51d24bdaee054354f6
Adam Lesinski [Wed, 12 Oct 2016 21:03:13 +0000 (21:03 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
am:
baac85ec1f
Change-Id: I713561fcfdf28250e406fc9d7b497c2b70b287ca
Martin Wallgren [Wed, 12 Oct 2016 21:03:11 +0000 (21:03 +0000)]
RRO: Synchronize access to overlays.list
am:
0fbb608110
Change-Id: I44a716df3954b6d2d58d7c9784f8b55cf041b10b
Doris Liu [Wed, 12 Oct 2016 20:56:58 +0000 (20:56 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
am:
269f76a7d2
Change-Id: Ia9a56b7c8c20d47e9dcc448c59061784d4edf865
Doris Liu [Wed, 12 Oct 2016 20:56:55 +0000 (20:56 +0000)]
Fix SkShader leak for Gradient VectorDrawable and test
am:
fc9cf72339
Change-Id: I493a8c52cd4cca79971a4fd2e3eed7f566ce8ecd
Adam Lesinski [Wed, 12 Oct 2016 20:55:53 +0000 (20:55 +0000)]
Merge "RRO: Synchronize access to overlays.list" into nyc-mr1-dev
Doris Liu [Wed, 12 Oct 2016 20:44:47 +0000 (20:44 +0000)]
Merge "Fix SkShader leak for Gradient VectorDrawable and test" into nyc-mr1-dev
Prashant Malani [Wed, 12 Oct 2016 20:30:35 +0000 (20:30 +0000)]
Merge "services: Use HIDL Vibrator"
Romain Guy [Wed, 12 Oct 2016 19:14:07 +0000 (12:14 -0700)]
Various fixes for linear blending and gradients
With linear blending turned off some textures were still
created as sRGB textures instead of linear textures.
Multi-stop gradients were not behaving properly on devices
with no support for float textures.
Gradients are now always interpolated in linear space
even if linear blending is off.
New functions to always force sRGB->linear->sRGB conversions.
Test: Manual testing
Bug:
29940137
Change-Id: Ie2f84ee2a65fd85570e88af813e841e0e625df6c
Aurimas Liutikas [Tue, 11 Oct 2016 21:01:36 +0000 (14:01 -0700)]
Enable Checkstyle preupload hook for certain frameworks/base directories.
Enables Checkstyle preupload hook for the following directories:
- core/java/android/animation/
- core/java/android/text/
- core/java/android/view/
- core/java/android/transition/
- core/java/android/widget/
Test: tested manually uploading a CL that contained many changes
to directories outside of the listed ones and checkstyle did
not complain about those.
Change-Id: I795ba478fad7af124c43ca1e18d51b33d7800976
Aurimas Liutikas [Wed, 12 Oct 2016 19:54:52 +0000 (19:54 +0000)]
Merge "Fix import statements in android.widget package."
TreeHugger Robot [Wed, 12 Oct 2016 19:49:14 +0000 (19:49 +0000)]
Merge "layoutlib relies on refSkPixelRef(), put it back"
Shreyas Basarge [Wed, 12 Oct 2016 19:19:24 +0000 (19:19 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev am:
d5541b987a am:
e04c7f151b
am:
aef552bc28
Change-Id: I62a07cf2d917fae23a698f84bc0dd33e17a77c6f
Shreyas Basarge [Wed, 12 Oct 2016 19:18:23 +0000 (19:18 +0000)]
Add a delay before scheduling local syncs am:
ba1f790369 am:
50a22690f8
am:
471384106a
Change-Id: Iec0a0623c1086fb0e8ef738bdcd1185395539e0b
Daniel Sandler [Wed, 12 Oct 2016 19:17:18 +0000 (19:17 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev am:
52cd2948a6 am:
bfc83493fe
am:
cca515a24d
Change-Id: Ic8ac180f57dd41ca9f2d7b60fc44addf90f6c766
Dan Sandler [Wed, 12 Oct 2016 19:16:21 +0000 (19:16 +0000)]
Essential packages' notifications can no longer be silenced. am:
028a60f003 am:
b50c46a64e
am:
15994be698 -s ours
Change-Id: Ic88140adb3051be81c0e70a7c44ee636489bd991
TreeHugger Robot [Wed, 12 Oct 2016 18:01:28 +0000 (18:01 +0000)]
Merge "Switch APCT Perf test to JUnit 4.11 friendly"
Romain Guy [Wed, 12 Oct 2016 17:55:08 +0000 (10:55 -0700)]
layoutlib relies on refSkPixelRef(), put it back
Test: Build aosp_arm64-eng successfully
Change-Id: Ic00cacac9aa1006ec16060a95bd1a22133e9a4bd
Shreyas Basarge [Wed, 12 Oct 2016 17:26:56 +0000 (17:26 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev am:
d5541b987a
am:
e04c7f151b
Change-Id: I0f57a66ce33a44e56568a7a53f71424f032ff3f1
Shreyas Basarge [Wed, 12 Oct 2016 17:25:58 +0000 (17:25 +0000)]
Add a delay before scheduling local syncs am:
ba1f790369
am:
50a22690f8
Change-Id: Ie4badc26375427be86788fefc3d5e84cfcdab933
Shreyas Basarge [Wed, 12 Oct 2016 17:19:59 +0000 (17:19 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
am:
d5541b987a
Change-Id: If91f2edc57109308b34be67b9f3861b84147153f
Shreyas Basarge [Wed, 12 Oct 2016 17:19:56 +0000 (17:19 +0000)]
Add a delay before scheduling local syncs
am:
ba1f790369
Change-Id: I4c880c4111f99d80cee7b960a97133cc0b86d61c
Shreyas Basarge [Wed, 12 Oct 2016 17:09:53 +0000 (17:09 +0000)]
Merge "Add a delay before scheduling local syncs" into nyc-mr1-dev
TreeHugger Robot [Wed, 12 Oct 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Switch WindowState to get display content from its window token"
Selim Cinek [Tue, 11 Oct 2016 19:49:48 +0000 (12:49 -0700)]
Fixed an issue where the emergency affordance would show
If a device isn't voice capable, it shouldn't show the emergency
option.
Test: use tablet which isn't voice capable, insert indian sim and
make sure no emergency option is displayed in global actions.
Bug:
31953703
Change-Id: I351e87320f3ffec76d1c1fc5aac78e5c48c0ac54
TreeHugger Robot [Wed, 12 Oct 2016 16:21:43 +0000 (16:21 +0000)]
Merge "Fix channel conditional in cancelAll."
Aurimas Liutikas [Wed, 12 Oct 2016 01:17:42 +0000 (18:17 -0700)]
Fix import statement in view|transition|animation packages.
This change also remove trailing whitespace.
Test: code still compiles
Change-Id: I7eff4546320d67d2bae58d31bad0625ea0791b8f
Romain Guy [Wed, 12 Oct 2016 15:52:12 +0000 (15:52 +0000)]
Merge "Linear blending, step 1"
Wale Ogunwale [Mon, 10 Oct 2016 20:25:26 +0000 (13:25 -0700)]
Switch WindowState to get display content from its window token
WindowState no longer needs to track what display it is on now
that the window token can only be on one display.
Test: Existing tests pass.
Change-Id: Ia0530d73da0b1ecc17f596ec62c933637bd1c2c3
Martin Wallgren [Tue, 11 Aug 2015 13:10:31 +0000 (15:10 +0200)]
RRO: Synchronize access to overlays.list
idmap --scan is executed as a part of the pre-loading in ZygoteInit.
The pre loading is executed in parallel for each supported architecture
(32/64 bit). This will cause a race condition in the creation of the
overlays.list file and the idmap files for the system overlays.
Apply flock on overlays.list to prevent the file from being thrown away
and recreated when it is in use by another Zygote.
Cherry-picked from AOSP.
Bug:
28032298
Test: manual
Change-Id: I51d39f121d207b11181340b68b164b60020f0c61
Julia Reynolds [Wed, 12 Oct 2016 14:31:55 +0000 (10:31 -0400)]
Fix channel conditional in cancelAll.
Bug:
32083625
Test: manual and runtest systemui-jank -c android.platform.systemui.tests.jank.SystemUiJankTests -m testNotificationListPull
Change-Id: I1b9bb7a287be461d832816f22822c6dd6eb5e8f0
Daniel Sandler [Wed, 12 Oct 2016 13:56:14 +0000 (13:56 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev am:
52cd2948a6
am:
bfc83493fe
Change-Id: I634618ab4cdebe58118a602387a0c561866b0089
Dan Sandler [Wed, 12 Oct 2016 13:55:17 +0000 (13:55 +0000)]
Essential packages' notifications can no longer be silenced. am:
028a60f003
am:
b50c46a64e
Change-Id: I12e95285baabe5356c3f04e17587afecd3caf292
Daniel Sandler [Wed, 12 Oct 2016 13:49:15 +0000 (13:49 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
am:
52cd2948a6
Change-Id: I00c94e1299651f12e030904a77396b74e825d8d9
Dan Sandler [Wed, 12 Oct 2016 13:49:11 +0000 (13:49 +0000)]
Essential packages' notifications can no longer be silenced.
am:
028a60f003
Change-Id: Ic3e80d30c99e448c7719d5d40c9e957df94a6af6
Daniel Sandler [Wed, 12 Oct 2016 13:38:59 +0000 (13:38 +0000)]
Merge "Essential packages' notifications can no longer be silenced." into nyc-mr1-dev
Wale Ogunwale [Mon, 26 Sep 2016 22:21:22 +0000 (15:21 -0700)]
Associate WindowToken object with only one display at a time
WindowTokens were global objects that contained windows that could
be on multiple displays. This model does not work with the
WindowContainer hierarachy as children (window tokens) can not have
mulitple parents (displays).
We now:
- Track the mapping of binder tokens to window tokens per display
instead of globally . So, you can have a binder token map to
individual WindowToken objects per display.
- WMS.addWindowToken is used to create a WindowToken that clients
can then later add windows to. However, when addWindowToken is called
we don't know the display the client(s) would like to add window to.
So, we track binder tokens that we are allowed to add window for in
the RootWindowContainer and create a window token for the binder on
a specific display when we try to add a window.
Bug:
30060889
Test: Manual testing and existing tests pass.
Change-Id: I81a52a32b01c33ed32169d2da0506b688ea9bc8a
Michal Karpinski [Wed, 12 Oct 2016 11:33:28 +0000 (11:33 +0000)]
Merge "Extending DNS event reporting"
Daichi Hirono [Wed, 12 Oct 2016 07:00:00 +0000 (16:00 +0900)]
Rename AppFuseTest in perf test package to AppFusePerfTest.
Previously we have two AppFuseTest class in the normal test and the perf
test. The CL renames the one in the perf test to different name.
Bug:
31982374
Test: adb shell am instrument -w com.android.mtp.perftests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I6272d7f78cead0bfeee7cf83ed50c77658caa1c0
Erik Wolsheimer [Wed, 12 Oct 2016 05:21:05 +0000 (05:21 +0000)]
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev am:
56746f9830
am:
c806566082
Change-Id: I9afc090a0d5c845e19a78e3af7c452d3f470fa88
Erik Wolsheimer [Wed, 12 Oct 2016 05:20:08 +0000 (05:20 +0000)]
Change 2nd and later burn-in protection intervals to 2 mins am:
3b3940d381
am:
5b9d419965
Change-Id: I8435f5cf90814965db8df492dbea5cfa3f3e76cb
Erik Wolsheimer [Wed, 12 Oct 2016 05:13:00 +0000 (05:13 +0000)]
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
am:
56746f9830
Change-Id: I89b58af12ee5940ad3f4cbb93f9777eeb641df86
Erik Wolsheimer [Wed, 12 Oct 2016 05:12:55 +0000 (05:12 +0000)]
Change 2nd and later burn-in protection intervals to 2 mins
am:
3b3940d381
Change-Id: I65eb928e9d76df790826cd021753c240e957cdad
TreeHugger Robot [Wed, 12 Oct 2016 05:03:53 +0000 (05:03 +0000)]
Merge "Change 2nd and later burn-in protection intervals to 2 mins" into cw-f-dev
TreeHugger Robot [Wed, 12 Oct 2016 03:16:00 +0000 (03:16 +0000)]
Merge "Fix contentDescription for NightDisplayTile"
Erik Wolsheimer [Tue, 11 Oct 2016 22:32:37 +0000 (15:32 -0700)]
Change 2nd and later burn-in protection intervals to 2 mins
BUG:
31855095
Change-Id: I969e24d2db882109855b74430b806247c4fbf6cb
TreeHugger Robot [Wed, 12 Oct 2016 02:11:07 +0000 (02:11 +0000)]
Merge "Fix imports in android.text package."
Alan Viverette [Wed, 12 Oct 2016 01:49:20 +0000 (01:49 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev am:
d35d3c98e4 am:
250262a313
am:
56d5f228da
Change-Id: Ifd03c7f941da39b36b2c7a12dc1c776a19fb2e97
Alan Viverette [Wed, 12 Oct 2016 01:48:23 +0000 (01:48 +0000)]
Add note about density scaling behavior to setImageURI am:
ac21e56f63 am:
74c6d9bd3f
am:
0754f59c4a
Change-Id: Ie22b497eed13c815d40e004db6e19a9875f5168f
Alan Viverette [Wed, 12 Oct 2016 01:42:54 +0000 (01:42 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev am:
d35d3c98e4
am:
250262a313
Change-Id: I61df0091ee1785947cb01fde77bda1a5a0460e31
Alan Viverette [Wed, 12 Oct 2016 01:42:06 +0000 (01:42 +0000)]
Add note about density scaling behavior to setImageURI am:
ac21e56f63
am:
74c6d9bd3f
Change-Id: I5b6f9d978d61aedac2c53dcf75dea449468d3c7b
Alan Viverette [Wed, 12 Oct 2016 01:36:36 +0000 (01:36 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev
am:
d35d3c98e4
Change-Id: Id6921412886e72fb70fdbb0b23806c88a6638ae4
Alan Viverette [Wed, 12 Oct 2016 01:36:33 +0000 (01:36 +0000)]
Add note about density scaling behavior to setImageURI
am:
ac21e56f63
Change-Id: I4a85ae20023dd0589227ca7684a965a246f451fd
Julia Reynolds [Wed, 12 Oct 2016 01:31:32 +0000 (01:31 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev am:
6c816c6707 am:
331eea4900
am:
1326f35397
Change-Id: I747d6c79821b0305869d828e1c2e37f648c9472d
Julia Reynolds [Wed, 12 Oct 2016 01:30:40 +0000 (01:30 +0000)]
Stop posting config asynchronously. am:
3ebe72b26a am:
532ebb02a7
am:
86628d4f12
Change-Id: Ie4aebb5290fd214ab5698021052040c19d919755
Julia Reynolds [Wed, 12 Oct 2016 01:25:06 +0000 (01:25 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev am:
6c816c6707
am:
331eea4900
Change-Id: Ica84c11c5edecc2deee90cfd580f60198aefcc9a
TreeHugger Robot [Wed, 12 Oct 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Add note about density scaling behavior to setImageURI" into nyc-mr1-dev
Julia Reynolds [Wed, 12 Oct 2016 01:24:02 +0000 (01:24 +0000)]
Stop posting config asynchronously. am:
3ebe72b26a
am:
532ebb02a7
Change-Id: I7698cde7696c967f9cd8659b3da50dbc9b4ea2bc
Doris Liu [Mon, 10 Oct 2016 22:50:01 +0000 (15:50 -0700)]
Fix SkShader leak for Gradient VectorDrawable and test
This CL fixes a SkShader leak in VD when applying local matrix
to the shader. Specifically, the usage of newWithLocalMatrix(...)
increments the shader's ref count in every draw() call for
Gradient VectorDrawable, whereas there's no balancing call to
decrement the ref count in draw(). In this CL, we assume
the ownership of the shader returned from newWithLocalMatrix(...)
to ensure the correct ref count management.
Also, add test to verify that shader is no longer being leaked
BUG:
32067647
Test: this CL
Change-Id: Ic15fe46cde06a73d81b44e2d3c56b51907344cc0
Julia Reynolds [Wed, 12 Oct 2016 01:18:37 +0000 (01:18 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev
am:
6c816c6707
Change-Id: I1e30c8b770d6f3c719c3fcb2964c8ab30fa79542
Julia Reynolds [Wed, 12 Oct 2016 01:18:33 +0000 (01:18 +0000)]
Stop posting config asynchronously.
am:
3ebe72b26a
Change-Id: If0ebacf0a128d56c70178a03c1c2532d984c796e
TreeHugger Robot [Wed, 12 Oct 2016 01:10:56 +0000 (01:10 +0000)]
Merge "Stop posting config asynchronously." into nyc-mr1-dev
Salvador Martinez [Wed, 12 Oct 2016 01:03:30 +0000 (18:03 -0700)]
Restricted switch preference uses ripple on focus
Modified layout used by settingsLib to user
selectableItemBackground to get ripple effect
when focused by user.
Test: Visual Inspection
Bug:
31975611
Change-Id: I481db63c9ffb3aa5645ff052bf10dddd43dfbdad
Kevin Hufnagle [Wed, 12 Oct 2016 00:56:43 +0000 (00:56 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
2f54d4301d am:
c9267a1f36 am:
de7f56a58a
am:
1372dc2718
Change-Id: I799e69e916b06009e137f8d3188a9403080cc071
Kevin Hufnagle [Wed, 12 Oct 2016 00:55:46 +0000 (00:55 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
36838b070c am:
ee80c871d1 am:
6795dae4ce
am:
6acfd8a6c9
Change-Id: Ic6d380288f140203ab832381d26a71f383aacb57
TreeHugger Robot [Wed, 12 Oct 2016 00:54:23 +0000 (00:54 +0000)]
Merge "power: PowerHAL support for HIDL interfaces."
Romain Guy [Thu, 29 Sep 2016 00:34:42 +0000 (17:34 -0700)]
Linear blending, step 1
NOTE: Linear blending is currently disabled in this CL as the
feature is still a work in progress
Android currently performs all blending (any kind of linear math
on colors really) on gamma-encoded colors. Since Android assumes
that the default color space is sRGB, all bitmaps and colors
are encoded with the sRGB Opto-Electronic Conversion Function
(OECF, which can be approximated with a power function). Since
the power curve is not linear, our linear math is incorrect.
The result is that we generate colors that tend to be too dark;
this affects blending but also anti-aliasing, gradients, blurs,
etc.
The solution is to convert gamma-encoded colors back to linear
space before doing any math on them, using the sRGB Electo-Optical
Conversion Function (EOCF). This is achieved in different
ways in different parts of the pipeline:
- Using hardware conversions when sampling from OpenGL textures
or writing into OpenGL frame buffers
- Using software conversion functions, to translate app-supplied
colors to and from sRGB
- Using Skia's color spaces
Any type of processing on colors must roughly ollow these steps:
[sRGB input]->EOCF->[linear data]->[processing]->OECF->[sRGB output]
For the sRGB color space, the conversion functions are defined as
follows:
OECF(linear) :=
linear <= 0.
0031308 ? linear * 12.92 : (pow(linear, 1/2.4) * 1.055) - 0.055
EOCF(srgb) :=
srgb <= 0.04045 ? srgb / 12.92 : pow((srgb + 0.055) / 1.055, 2.4)
The EOCF is simply the reciprocal of the OECF.
While it is highly recommended to use the exact sRGB conversion
functions everywhere possible, it is sometimes useful or beneficial
to rely on approximations:
- pow(x,2.2) and pow(x,1/2.2)
- x^2 and sqrt(x)
The latter is particularly useful in fragment shaders (for instance
to apply dithering in sRGB space), especially if the sqrt() can be
replaced with an inversesqrt().
Here is a fairly exhaustive list of modifications implemented
in this CL:
- Set TARGET_ENABLE_LINEAR_BLENDING := false in BoardConfig.mk
to disable linear blending. This is only for GLES 2.0 GPUs
with no hardware sRGB support. This flag is currently assumed
to be false (see note above)
- sRGB writes are disabled when entering a functor (WebView).
This will need to be fixed at some point
- Skia bitmaps are created with the sRGB color space
- Bitmaps using a 565 config are expanded to 888
- Linear blending is disabled when entering a functor
- External textures are not properly sampled (see below)
- Gradients are interpolated in linear space
- Texture-based dithering was replaced with analytical dithering
- Dithering is done in the quantization color space, which is
why we must do EOCF(OECF(color)+dither)
- Text is now gamma corrected differently depending on the luminance
of the source pixel. The asumption is that a bright pixel will be
blended on a dark background and the other way around. The source
alpha is gamma corrected to thicken dark on bright and thin
bright on dark to match the intended design of fonts. This also
matches the behavior of popular design/drawing applications
- Removed the asset atlas. It did not contain anything useful and
could not be sampled in sRGB without a yet-to-be-defined GL
extension
- The last column of color matrices is converted to linear space
because its value are added to linear colors
Missing features:
- Resource qualifier?
- Regeneration of goldeng images for automated tests
- Handle alpha8/grey8 properly
- Disable sRGB write for layers with external textures
Test: Manual testing while work in progress
Bug:
29940137
Change-Id: I6a07b15ab49b554377cd33a36b6d9971a15e9a0b
Kevin Hufnagle [Wed, 12 Oct 2016 00:46:36 +0000 (00:46 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev am:
2acaf0a120 am:
2f54d4301d am:
c9267a1f36
am:
de7f56a58a
Change-Id: Ide2f950b47c9c7a414d47bcc56c7ea8976e2a714
Christopher Tate [Wed, 12 Oct 2016 00:46:06 +0000 (00:46 +0000)]
Merge "Respect restoreAnyVersion=true in full-data restore path" into nyc-mr1-dev am:
cef0c6b5a5 am:
37f54083f0
am:
e5854d943c
Change-Id: I59856f5181e27b1810d49d9e49a450c51703f3df
Kevin Hufnagle [Wed, 12 Oct 2016 00:45:39 +0000 (00:45 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs am:
1965375aa5 am:
36838b070c am:
ee80c871d1
am:
6795dae4ce
Change-Id: Ifa7bee4f7e5d10c855d3e93ae5bd116e69a6e8a4
Christopher Tate [Wed, 12 Oct 2016 00:45:13 +0000 (00:45 +0000)]
Respect restoreAnyVersion=true in full-data restore path am:
d990e4d3df am:
f413e3f2fe
am:
182c65a41b
Change-Id: I4af6eeb29fbef7384d9764b83a8642db6b3398ec
Chet Haase [Wed, 12 Oct 2016 00:44:18 +0000 (00:44 +0000)]
Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev am:
aea27e1aea am:
8f8547f1ed
am:
eb63f9f3ad
Change-Id: I11d8c63b37f03211358703cc1944c04b2686af1d
Chet Haase [Wed, 12 Oct 2016 00:43:30 +0000 (00:43 +0000)]
Fix small typo in ShortcutManager header docs am:
c158431f8e am:
5aa0dfcc0a
am:
3267a2462d
Change-Id: I9417c0a15bbc2125dd0c370bc09b2315706005f1