Howard Ro
effe92f289
Merge "More description on logBinaryPushStateChanged" into qt-dev
...
am: 2470fdb507
2019-04-08 14:35:43 -07:00
Ryan Mitchell
c8b5afc692
Merge "Allow merging of resources with the same overlayable" into qt-dev
...
am: 636f9ae0c2
2019-04-08 14:26:12 -07:00
Howard Ro
2470fdb507
Merge "More description on logBinaryPushStateChanged" into qt-dev
2019-04-08 21:19:35 +00:00
Tyler Gunn
6fc4da9785
Merge "Add @hide API to get the phone account handle for a subId." into qt-dev
...
am: beeb456338
2019-04-08 14:16:06 -07:00
Bryan Mawhinney
1e7e4324e3
Merge "Make colorPrimary darker in Theme.DeviceDefault.Settings at night" into qt-dev
...
am: e5b5f30fbe
2019-04-08 14:10:21 -07:00
TreeHugger Robot
636f9ae0c2
Merge "Allow merging of resources with the same overlayable" into qt-dev
2019-04-08 21:06:32 +00:00
Bryan Mawhinney
066afb6c98
Merge "Allow themeing of icon in SuspendedAppActivity" into qt-dev
...
am: 353c5cc16a
2019-04-08 14:02:35 -07:00
Tyler Gunn
beeb456338
Merge "Add @hide API to get the phone account handle for a subId." into qt-dev
2019-04-08 20:44:05 +00:00
Nathan Harold
039a58dffb
Merge "Revert a bad merge from ag/6938423" into qt-dev-plus-aosp
2019-04-08 20:38:22 +00:00
Bill Yi
5e7a4efa25
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 568b02ee00
2019-04-08 13:33:14 -07:00
TreeHugger Robot
e5b5f30fbe
Merge "Make colorPrimary darker in Theme.DeviceDefault.Settings at night" into qt-dev
2019-04-08 20:32:28 +00:00
Nathan Harold
12f75864a2
Revert a bad merge from ag/6938423
...
Bug: 130174575
Test: none
Change-Id: I7684f9e06f4d226010448e5520965a8733c43073
2019-04-08 13:32:17 -07:00
Fabian Kozynski
5e59d60b3d
Merge "Visual changes to QS header" into qt-dev
...
am: e19335a443
2019-04-08 13:26:20 -07:00
TreeHugger Robot
353c5cc16a
Merge "Allow themeing of icon in SuspendedAppActivity" into qt-dev
2019-04-08 20:17:28 +00:00
Bryan Mawhinney
cf1eee71f0
Allow themeing of icon in SuspendedAppActivity
...
By passing the current theme to getDrawable, we allow the suspending app
to provide, e.g., a vector drawable tinted according to the system theme
(note, *not* the suspending app theme).
Test: manual
Bug: 129995419
Change-Id: Id9d4e3292baa324856dd817fe9ac979c07339fb0
2019-04-08 20:17:01 +00:00
sqian
2881e89cee
[automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144
...
am: 3c9e9d193987833ee867
2019-04-08 13:15:08 -07:00
Android Build Merger (Role)
1704d678ff
Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 f2f1f27098 is in history" into qt-dev-plus-aosp
2019-04-08 19:56:03 +00:00
Remi NGUYEN VAN
d7ba309e30
[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours
...
am: 204ef43f56f2f1f27098
2019-04-08 12:55:30 -07:00
TreeHugger Robot
568b02ee00
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-08 19:54:18 +00:00
Android Build Merger (Role)
1b846b4604
Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp
2019-04-08 19:51:03 +00:00
Kyeongkab.Nam
3e12920345
Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e
...
am: d526de2ca2
2019-04-08 12:50:30 -07:00
Fabian Kozynski
e19335a443
Merge "Visual changes to QS header" into qt-dev
2019-04-08 19:49:11 +00:00
Android Build Merger (Role)
b1a0373791
Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp
2019-04-08 19:46:14 +00:00
Lucas Lin
1b752e600b
Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f
...
am: d454c3c276
2019-04-08 12:45:40 -07:00
Android Build Merger (Role)
074053853c
Merge "Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68 am: 070e341303" into qt-dev-plus-aosp
2019-04-08 19:41:16 +00:00
Remi NGUYEN VAN
73f66b3e92
Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68
...
am: 070e341303
2019-04-08 12:40:48 -07:00
Android Build Merger (Role)
7fecc34996
Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62 am: b85b487e31" into qt-dev-plus-aosp
2019-04-08 19:36:26 +00:00
Anil Admal
2eea7ac272
Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62
...
am: b85b487e31
2019-04-08 12:36:02 -07:00
Android Build Merger (Role)
8818a8c6c7
Merge "Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6 am: cc94ad60b0" into qt-dev-plus-aosp
2019-04-08 19:31:35 +00:00
Lorenzo Colitti
2373c8a129
Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6
...
am: cc94ad60b0
2019-04-08 12:31:01 -07:00
Mark Renouf
5381f32888
Merge "BubbleData [2/n]: adds Listener interface" into qt-dev
...
am: 4c916ecf7c
2019-04-08 12:30:20 -07:00
Android Build Merger (Role)
ec91922c54
Merge "[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e am: d4b3f65d35 -s ours am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6f0 is in history" into qt-dev-plus-aosp
2019-04-08 19:26:40 +00:00
Shuo Qian
958aa683a4
[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e
...
am: d4b3f65d35fa9460a6f0
2019-04-08 12:26:08 -07:00
Android Build Merger (Role)
310c197142
Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev am: f883ea697e" into qt-dev-plus-aosp
2019-04-08 19:23:56 +00:00
Winson Chung
45fd1f4e6d
Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev
...
am: f883ea697e
2019-04-08 12:23:28 -07:00
Android Build Merger (Role)
eb553b0df7
Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp
2019-04-08 19:21:44 +00:00
Tobias Thierer
b6e63b4b68
Merge changes I4e32a588,I202c5653 am: 003ab94333
...
am: b7ca85651f
2019-04-08 12:21:20 -07:00
Android Build Merger (Role)
3f176785c5
Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c52" into qt-dev-plus-aosp
2019-04-08 19:17:40 +00:00
Bookatz
93bf279e9c
Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev
...
am: a126a24c52
2019-04-08 12:17:20 -07:00
Android Build Merger (Role)
718d5723b0
Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history" into qt-dev-plus-aosp
2019-04-08 19:16:54 +00:00
Jack Yu
def98e2c41
[automerger skipped] Merge "Improved the debug message" am: cacfab6728
...
am: 253a1391020c92c23951
2019-04-08 12:16:24 -07:00
Mark Renouf
4c916ecf7c
Merge "BubbleData [2/n]: adds Listener interface" into qt-dev
2019-04-08 19:15:03 +00:00
Android Build Merger (Role)
8bbd520899
Merge "[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0 am: 24fc368617 -s ours am skip reason: change_id I9e8449e5a75db616e646f55c930ff82982fc9083 with SHA1 d78542bb52 is in history" into qt-dev-plus-aosp
2019-04-08 19:11:54 +00:00
Amith Yamasani
0d835c50b3
[automerger skipped] Merge "Fix for NetworkStats/Telephony deadlock" am: 0d4445f1e0
...
am: 24fc368617d78542bb52
2019-04-08 12:11:24 -07:00
Android Build Merger (Role)
3427f091e0
Merge "[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f am: ee6ed6914f -s ours am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history" into qt-dev-plus-aosp
2019-04-08 19:07:03 +00:00
Chenbo Feng
4708ff609b
[automerger skipped] Merge "Move NetworkStatsFactory into service directory" am: 48294e098f
...
am: ee6ed6914f061cec7755
2019-04-08 12:06:35 -07:00
Winson Chung
f883ea697e
Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev
2019-04-08 19:05:27 +00:00
TreeHugger Robot
a126a24c52
Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev
2019-04-08 19:03:25 +00:00
Bill Yi
f32bcf72b6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 6b539282c2
2019-04-08 12:02:52 -07:00
Bill Yi
2538206e20
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 7581837e06
2019-04-08 11:51:07 -07:00
