Rubin Xu
5fbc0e59f5
Merge "Clarify SystemUpdatePolicy" into pi-dev
...
am: 4019c39405
2018-04-24 04:10:58 -07:00
TreeHugger Robot
4019c39405
Merge "Clarify SystemUpdatePolicy" into pi-dev
2018-04-24 10:59:50 +00:00
Chalard Jean
a4eec2cefa
Merge changes I0cd83a93,I03ae2bbb into pi-dev
...
am: 411e79b8b0
2018-04-24 03:02:11 -07:00
Chalard Jean
411e79b8b0
Merge changes I0cd83a93,I03ae2bbb into pi-dev
...
* changes:
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
2018-04-24 09:53:32 +00:00
Selim Cinek
0744f1d4b1
Merge changes from topic "notification_reply_action" into pi-dev
...
am: 53790c1c8f
2018-04-24 02:26:30 -07:00
Selim Cinek
53790c1c8f
Merge changes from topic "notification_reply_action" into pi-dev
...
* changes:
Cleaned up the paddings of the messaging layout and smart replies
Changed the size of the largeIcon
Moved the disabling from alpha to manual color blending
Updated the color of the reply button to be more neutral
Updated the reply icon
Disabled reply action when pending intents are cancelled
Split the reply icon permanently from the right icon
2018-04-24 09:10:38 +00:00
Kenny Guy
06c4122c74
Merge "Add spinner for smart replies." into pi-dev
...
am: 5f18904a00
2018-04-24 02:02:47 -07:00
TreeHugger Robot
5f18904a00
Merge "Add spinner for smart replies." into pi-dev
2018-04-24 08:51:56 +00:00
Nicolas Geoffray
5824fce1c8
Merge "Add light grey APIs." into pi-dev
...
am: 95b7e63103
2018-04-24 01:40:55 -07:00
Chalard Jean
26400490a2
Make sure getActiveNetwork is consistent with default callbacks
...
Bug: 77737389
Test: runtest framework-net
new test don't pass without the main code change, but they
do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091
2018-04-24 17:32:00 +09:00
Nicolas Geoffray
95b7e63103
Merge "Add light grey APIs." into pi-dev
2018-04-24 08:30:12 +00:00
Przemyslaw Szczepaniak
b3c294c857
Merge "Log package name when showing targetSdkVersion warning" into pi-dev
...
am: 9d4d6e9d1a
2018-04-24 01:17:50 -07:00
TreeHugger Robot
9d4d6e9d1a
Merge "Log package name when showing targetSdkVersion warning" into pi-dev
2018-04-24 08:07:27 +00:00
Yu-Han Yang
566987a3be
Merge "Check provider exists and is enabled when request location" into pi-dev
...
am: 4c958d0e6b
2018-04-24 00:04:46 -07:00
Przemyslaw Szczepaniak
5e0612cdaa
Log package name when showing targetSdkVersion warning
...
Test: manual verification
Bug: 78332004
Change-Id: Ie91ac06e3a973edf655362b836698185a0aa7602
2018-04-24 07:01:46 +00:00
TreeHugger Robot
4c958d0e6b
Merge "Check provider exists and is enabled when request location" into pi-dev
2018-04-24 06:57:34 +00:00
Selim Cinek
1c72fa0249
Cleaned up the paddings of the messaging layout and smart replies
...
Refactored the code such that the reply icon's inset was substracted
from the overall paddings to make all of them consistent. This
will also help in the future as we don't have to update those
paddings manually anymore.
Test: test all sorts of combinations with Notify
Change-Id: I8c6c9951bc73c88d95cb443c8e618c7adca7ebd3
Fixes: 78441535
2018-04-24 14:33:29 +08:00
Chalard Jean
fb0c87e8b4
Add tests for getActiveNetwork.
...
Bug: 77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da
2018-04-24 15:23:28 +09:00
Selim Cinek
1655085dea
Changed the size of the largeIcon
...
Also tunes the paddings with largeIcons more
Test: test margins for all templates, ensure nice wrapping
Change-Id: I9ace23c2a6b38fdf25e46fd55d6848b8922851a3
Fixes: 76415894
2018-04-24 13:22:04 +08:00
Selim Cinek
019d71ecfc
Moved the disabling from alpha to manual color blending
...
The Transformations don't preserve alpha currently and it's
hard to fix without the risk of introducing regressions.
We instead blend the color manually now.
Change-Id: Ib9c209295529c5e04564a3faed74160914951152
Fixes: 77811784
2018-04-24 13:22:02 +08:00
Nathan Harold
67c9f1ea25
[automerger skipped] Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" am: 238eaf5183
...
am: 26123f6efd
2018-04-23 22:20:13 -07:00
Nathan Harold
26123f6efd
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
...
am: 238eaf5183
2018-04-23 22:11:58 -07:00
Selim Cinek
4717d862a0
Updated the color of the reply button to be more neutral
...
The primaryTextColor wasn't a good fit, because it was
drawing too much attention being pure black. We're now
taking the default color instead. It's also used for
active permissions now.
Test: add notification, look at reply button.
Change-Id: If390c66e927a92a1115250abb7254fafe81b054c
Fixes: 72750728
2018-04-24 13:05:56 +08:00
Selim Cinek
276bd3b63e
Updated the reply icon
...
Change-Id: I0f8e91630cedefc6d9f44ded421243b719db7e6c
Fixes: 77244755
Test: observe new icon on notificaction
2018-04-24 13:05:56 +08:00
Selim Cinek
d83203cde4
Disabled reply action when pending intents are cancelled
...
Previously the user could open inline reply even when the
action was already cancelled. This also enables listening
to pending intent cancellations.
Test: manual
Fixes: 77811784
Change-Id: I4ae164081c6abdeb60a8e78d61bf5e4f26cca1d3
2018-04-24 13:05:53 +08:00
Yu-Han Yang
ac1a1280f0
Merge "Update Java doc of GnssMeasurementEvent#STATUS_NOT_ALLOWED" into pi-dev
...
am: d5a1bb621a
2018-04-23 21:11:28 -07:00
Yu-Han Yang
5e138ef62b
Merge "Refactor GnssBatchingProvider" into pi-dev
...
am: 4257db35fe
2018-04-23 21:04:19 -07:00
TreeHugger Robot
d5a1bb621a
Merge "Update Java doc of GnssMeasurementEvent#STATUS_NOT_ALLOWED" into pi-dev
2018-04-24 04:01:56 +00:00
Treehugger Robot
238eaf5183
Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE"
2018-04-24 03:56:40 +00:00
TreeHugger Robot
4257db35fe
Merge "Refactor GnssBatchingProvider" into pi-dev
2018-04-24 03:56:20 +00:00
Todd Kennedy
e31a442140
Merge "Allow overriding the compile SDK" into pi-dev
...
am: fd5166ddac
2018-04-23 20:23:12 -07:00
TreeHugger Robot
fd5166ddac
Merge "Allow overriding the compile SDK" into pi-dev
2018-04-24 03:14:04 +00:00
Shawn Lin
fbed7ebade
Merge "Fix the art work of lockscreen cannot be removed" into pi-dev
...
am: ab416a115a
2018-04-23 19:56:34 -07:00
Shawn Lin
ab416a115a
Merge "Fix the art work of lockscreen cannot be removed" into pi-dev
2018-04-24 02:46:28 +00:00
Andreas Gampe
d6a41f8bbc
[automerger skipped] Merge "PackageManager: Skip dexopt on install for debuggable apps" into pi-dev
...
am: f22fd65a25
2018-04-23 18:45:44 -07:00
TreeHugger Robot
f22fd65a25
Merge "PackageManager: Skip dexopt on install for debuggable apps" into pi-dev
2018-04-24 01:36:13 +00:00
Salvador Martinez
9bab244130
Merge "Update title for SysUI battery warning" into pi-dev
...
am: 0545eaefdd
2018-04-23 18:04:34 -07:00
Rob Carr
1af9e42461
Merge "Destroy app-less surfaces when becoming invisible with no animation." into pi-dev
...
am: d7681ccd25
2018-04-23 17:54:05 -07:00
Bryce Lee
9d9dcadfef
Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev
...
am: a16cc4215a
2018-04-23 17:48:04 -07:00
TreeHugger Robot
0545eaefdd
Merge "Update title for SysUI battery warning" into pi-dev
2018-04-24 00:46:56 +00:00
Android Build Merger (Role)
fecb262029
Merge "Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev am: 694f60005e" into pi-dev-plus-aosp
2018-04-24 00:38:41 +00:00
Suprabh Shukla
1516fa8ac3
Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev
...
am: 694f60005e
2018-04-23 17:38:05 -07:00
Android Build Merger (Role)
99ebce82de
Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am: 5faf7291f0 am: 09a80d1797" into pi-dev-plus-aosp
2018-04-24 00:34:07 +00:00
Andreas Gampe
0716be3cf5
Merge "PackageManager: Skip dexopt on install for debuggable apps" am: 5faf7291f0
...
am: 09a80d1797
2018-04-23 17:32:43 -07:00
Amin Shaikh
b9e1d6f961
Merge "Disable hotspot when data saver is on." into pi-dev
...
am: be99e9e60d
2018-04-23 17:31:40 -07:00
Rob Carr
d7681ccd25
Merge "Destroy app-less surfaces when becoming invisible with no animation." into pi-dev
2018-04-24 00:27:36 +00:00
Bryce Lee
a16cc4215a
Merge "Do not reference TaskRecord's intent without checking for null." into pi-dev
2018-04-24 00:25:42 +00:00
Andreas Gampe
09a80d1797
Merge "PackageManager: Skip dexopt on install for debuggable apps"
...
am: 5faf7291f0
2018-04-23 17:24:58 -07:00
Winson Chung
bd41ceda0b
Merge "Expose API to hide the IME during a recents animation" into pi-dev
...
am: 6fab40d82c
2018-04-23 17:24:36 -07:00
TreeHugger Robot
694f60005e
Merge "Failing setPackagesSuspended if user has a DO / PO" into pi-dev
2018-04-24 00:17:41 +00:00
