Christopher Tate
bc222b842d
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev am: 78a00503db
...
am: 3f9418bf0d
Change-Id: Ice11345dc40639e11f75248fd054fc14ef6c247b
2017-04-29 03:17:07 +00:00
TreeHugger Robot
78a00503db
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
2017-04-29 03:05:29 +00:00
Pavel Grafov
083ee917c0
Merge "Use List instead of array in network logging API." into oc-dev am: 83d139bd1b
...
am: 49e5ce52bb
Change-Id: If86cf7e255281caf7f0c4ffcded56c025a7d6409
2017-04-28 23:21:48 +00:00
TreeHugger Robot
83d139bd1b
Merge "Use List instead of array in network logging API." into oc-dev
2017-04-28 23:00:02 +00:00
Pavel Grafov
f09a16628d
Use List instead of array in network logging API.
...
Bug: 37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: ts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: Icba7e3178202e0e650689d98c4010a9b40c6a53c
2017-04-28 19:31:00 +01:00
Andrew Scull
5cf5494744
Merge "Expand abbreviation in constant identifier." into oc-dev am: 2c20a0f885
...
am: 7d32c0bd04
Change-Id: I435db9c38e42cb0d2dbf82441470e45dc37728cc
2017-04-28 18:25:23 +00:00
Shane Brennan
8bfbb0af21
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
2017-04-28 18:02:46 +00:00
Shane Brennan
7eec245c62
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
2017-04-28 17:56:56 +00:00
Jeff Sharkey
dd6a433163
Merge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
...
am: 86e27f65f8
Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf
2017-04-28 17:48:26 +00:00
Andrew Scull
2c20a0f885
Merge "Expand abbreviation in constant identifier." into oc-dev
2017-04-28 17:42:00 +00:00
Jeff Hao
d4f657a1b1
Merge "Prepend shared libraries in their original order."
2017-04-28 17:27:06 +00:00
TreeHugger Robot
77cc43e0d2
Merge "Respond to API council feedback." into oc-dev
2017-04-28 17:10:16 +00:00
Julia Reynolds
493014417b
Merge "Default number badging off." into oc-dev am: 076a255a76
...
am: 9b0ce863d3
Change-Id: If75d5012b1d2a3d8a9d7928d885b92f73f783c2e
2017-04-28 15:03:09 +00:00
Julia Reynolds
3033198561
Default number badging off.
...
Test: cts
Bug: 37737008
Change-Id: I5f73a648936d18c59c74334083b33e131395a681
2017-04-28 10:42:11 -04:00
Julia Reynolds
226ae10c66
Merge "Documentation updates" into oc-dev am: b8d4a94867
...
am: 9b4511c643
Change-Id: Ib8d4c116d548b55f395e977ab76bc1f85d9791ba
2017-04-28 14:01:53 +00:00
Julia Reynolds
b8d4a94867
Merge "Documentation updates" into oc-dev
2017-04-28 13:44:10 +00:00
Andrew Scull
17e1b5da53
Expand abbreviation in constant identifier.
...
The abbreviation is not in common use. Also remove FBE from
documentation as it also isn't used elsewhere.
Test: Build success
Bug: 37621349
Change-Id: Icf19be5e96e71dcd45aa7cac8f58b05b6d77d02b
2017-04-28 11:49:50 +01:00
Felipe Leme
ee15506088
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev am: b63d261f9c
...
am: f966d48f66
Change-Id: I2d7d5a8eb571ceb093f26d3f9805917b201167f7
2017-04-28 09:41:57 +00:00
TreeHugger Robot
b63d261f9c
Merge "Refactored Autofill to move starting flag out of Session." into oc-dev
2017-04-28 09:25:06 +00:00
Felipe Leme
03214b8198
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev am: 3dfd827574
...
am: 7c45398614
Change-Id: I5398a804be6f6674a0371fe319ba8789bd72e7f0
2017-04-28 06:55:57 +00:00
Svetoslav Ganov
633463af36
Merge "Implement the rest of autofill importance modes" into oc-dev am: 70c0221813
...
am: 1c4e06a3fe
Change-Id: Ie8a4a655770cb0175d335cf74cbb73b65a60e19d
2017-04-28 06:49:59 +00:00
TreeHugger Robot
3dfd827574
Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev
2017-04-28 06:42:22 +00:00
Felipe Leme
0aa4c5065d
Refactored Autofill to move starting flag out of Session.
...
Otherwise, all onFillRequest() calls in the same partition would use
the same flags.
Fixes: 37675138
Test: existing CtsAutoFillServiceTestCases pass
Test: CtsAssistTestCases pass
Test: PartitionedActivityTest.testAutofill4ParitionsMixManualAndAuto() pass
Change-Id: I03c8a036637bae534904d4f41265e451088cf940
2017-04-27 23:38:14 -07:00
Svetoslav Ganov
70c0221813
Merge "Implement the rest of autofill importance modes" into oc-dev
2017-04-28 06:30:07 +00:00
Felipe Leme
09a70628da
Changed HtmlInfo.getAttributes() to return List instead of ArrayList
...
Fixes: 37747396
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ief53e6d71805f561577b73e57a9d36bc3769862a
2017-04-28 04:56:29 +00:00
Winson Chung
3e16fdfe2a
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev am: a2f102b175
...
am: 0e71996f92
Change-Id: I9e98c2922365bd869c0d0e3f0a345a0c64e6879e
2017-04-28 02:01:07 +00:00
Svet Ganov
fd31f85d0c
Implement the rest of autofill importance modes
...
Test: CTS tests pass; augmented tests to verify new behavior
bug:36171235
Change-Id: Ieff2b8d7e1c3a3eba456deca7bed70c8e29c415e
2017-04-27 18:16:08 -07:00
Winson Chung
a2f102b175
Merge "Only sublist array by size or limit, whichever is smaller." into oc-dev
2017-04-28 00:58:23 +00:00
Winson Chung
90853251f3
Only sublist array by size or limit, whichever is smaller.
...
Bug: 37756537
Test: Set < 3 actions, ensure no crash...
Change-Id: I93a5ac78292fcdd870ebd897441c2cef0774d134
2017-04-27 17:38:21 -07:00
Adam Powell
738b69c235
Merge "Address API feedback for new fragment APIs" into oc-dev am: 13d03e504d
...
am: 3667b16a96
Change-Id: Idee18215f8441113186775813d12d01069ee45b0
2017-04-28 00:29:52 +00:00
Selim Cinek
e44061f9e7
Merge changes from topic 'music_extraction' into oc-dev
...
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
2017-04-28 00:24:55 +00:00
Jorim Jaggi
a88bacba17
Merge "Implement API council feedback for dismissKeyguard" into oc-dev am: 560324cfa0
...
am: 74b6192f8b
Change-Id: I9238bfa834a71830b6361874524105973dc55fb6
2017-04-27 23:30:45 +00:00
Sudheer Shanka
0e229d0066
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev am: 7e7f7d526d
...
am: 241674dedd
Change-Id: If9f1f1538c7c9c34057756fd221131d7cb430d9f
2017-04-27 23:26:48 +00:00
Selim Cinek
0847acd4d4
Implementing gradual image fade for the media template
...
Test: play music
Merged-In: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes: 36561228
2017-04-27 22:21:50 +00:00
Selim Cinek
5fb73f8629
Extracting the notification colors based on the album art
...
Media notifications are now extracting the background and
foreground colors from the album art.
Test: manual, play different songs
Bug: 36561228
Merged-In: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
2017-04-27 22:21:17 +00:00
TreeHugger Robot
13d03e504d
Merge "Address API feedback for new fragment APIs" into oc-dev
2017-04-27 22:18:11 +00:00
Lucas Dupin
97985d8453
Merge "Wallpaper color extraction"
2017-04-27 22:08:19 +00:00
TreeHugger Robot
a851b5ae76
Merge "DO NOT MERGE Revert "Wallpaper color extraction API stub"" into oc-dev
2017-04-27 21:44:56 +00:00
Selim Cinek
2c2b931efd
Merge changes from topic 'media_colorization_master'
...
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
2017-04-27 21:33:33 +00:00
Jorim Jaggi
560324cfa0
Merge "Implement API council feedback for dismissKeyguard" into oc-dev
2017-04-27 20:57:11 +00:00
TreeHugger Robot
8618e94820
Merge "Updating docs for RemoteInput non-textual inputs per API review request."
2017-04-27 20:55:26 +00:00
Julia Reynolds
0ffc13b9f2
Documentation updates
...
Test: make
Change-Id: I9c02b3bd40ff19615747d238b1156d5d21e492e6
Fixes: 37736867
Bug: 37743680
2017-04-27 20:53:34 +00:00
Amith Yamasani
b979c3aa0d
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev am: 3a4987bbe7
...
am: 73bdb10bc8
Change-Id: I3161578f7ffd31916e7f072f8a71d0367d402170
2017-04-27 20:51:01 +00:00
Sudheer Shanka
7e7f7d526d
Merge "Rename ActivityMonitor.onMatchIntent to onStartActivity." into oc-dev
2017-04-27 20:47:09 +00:00
Makoto Onuki
1bfe94164f
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am: 301663a61b
...
am: 27521581fb
Change-Id: I8b0443ccf4a876b4de0d6de6d1af7909a4dee00e
2017-04-27 20:32:27 +00:00
Pavel Grafov
a4bc6bae4a
Merge "Use InetAddress instead of String in network events." into oc-dev am: 54e534d6e7
...
am: c3ae946f66
Change-Id: If08ae7a4eed5d56c02c0d67a3d3fcffe46f982b5
2017-04-27 20:24:11 +00:00
TreeHugger Robot
3a4987bbe7
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
2017-04-27 20:21:49 +00:00
Makoto Onuki
301663a61b
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
2017-04-27 20:03:22 +00:00
TreeHugger Robot
54e534d6e7
Merge "Use InetAddress instead of String in network events." into oc-dev
2017-04-27 19:53:58 +00:00
Chad Brubaker
d65e8e8326
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am: a9d0e6b205
...
am: f4488dabd5
Change-Id: I6310b54fc3f5e11feb926fe904d33c4cf67db669
2017-04-27 19:51:45 +00:00