Joshua Tsuji
ffc653797c
Merge "Ignore tests that are more flaky after start pos fixes." into qt-dev
...
am: aedd21860a
Change-Id: Ie849e1b0aa7b0af0bcfe3eee9203277ba30af661
2019-05-20 07:41:33 -07:00
Andrii Kulian
edeb20cc75
Merge "Revert "Set parent for WindowProcessController"" into qt-dev
...
am: 55b635de99
Change-Id: I0781f5f8c158ac1a48449f116382863fafdb927a
2019-05-20 07:35:50 -07:00
Andrii Kulian
f06a8d8141
Merge "Revert "Override process config for cold start on secondary screens"" into qt-dev
...
am: 0fea6e25c5
Change-Id: Ie6a7c0c19db8c5631ef410ee7be8bedd337ba98b
2019-05-20 07:29:23 -07:00
Fabian Kozynski
80ebdd9929
Merge "Fixes QSCustomizer header height" into qt-dev
...
am: 1bebf6a1a0
Change-Id: I48f61442dc58e507f9f11374cd60fed6ea0a943b
2019-05-20 07:08:47 -07:00
TreeHugger Robot
aedd21860a
Merge "Ignore tests that are more flaky after start pos fixes." into qt-dev
2019-05-20 14:05:35 +00:00
Fabian Kozynski
d97c3d29e2
Merge "Sets Tile default state to INACTIVE" into qt-dev
...
am: 0d7d8d2baf
Change-Id: I050c0a371487f4095742b939b4ce74037f29ca90
2019-05-20 07:03:37 -07:00
TreeHugger Robot
55b635de99
Merge "Revert "Set parent for WindowProcessController"" into qt-dev
2019-05-20 13:58:25 +00:00
TreeHugger Robot
0fea6e25c5
Merge "Revert "Override process config for cold start on secondary screens"" into qt-dev
2019-05-20 13:58:25 +00:00
Fabian Kozynski
d0ba5a3527
Merge "Make ResourceIcon#get thread safe" into qt-dev
...
am: 426431ea29
Change-Id: Ie6c0caaad4a7be719ae3125767c8ca63bacae7c5
2019-05-20 06:58:21 -07:00
Mill Chen
f1a92b45e9
Merge "Add 2 attributes for list_divider_material" into qt-dev
...
am: 52293a0962
Change-Id: I235c1080e4318544bb03b254a26e47dee7f8b8e2
2019-05-20 06:47:06 -07:00
Fabian Kozynski
1bebf6a1a0
Merge "Fixes QSCustomizer header height" into qt-dev
2019-05-20 13:36:46 +00:00
TreeHugger Robot
0d7d8d2baf
Merge "Sets Tile default state to INACTIVE" into qt-dev
2019-05-20 13:34:25 +00:00
Fabian Kozynski
426431ea29
Merge "Make ResourceIcon#get thread safe" into qt-dev
2019-05-20 13:19:13 +00:00
TreeHugger Robot
52293a0962
Merge "Add 2 attributes for list_divider_material" into qt-dev
2019-05-20 13:15:45 +00:00
Remi NGUYEN VAN
d4b1d7a6f2
Merge "Add dumpsys network_stack version" into qt-dev
...
am: 8600673c5d
Change-Id: Ie2bfeb69427976144799002505beaca605bd655c
2019-05-20 05:51:54 -07:00
Ben Murdoch
d40df6b89e
Merge "Add Standby Bucket and job duration to ScheduledJobStateChanged atom." into qt-dev
...
am: ffc816283e
Change-Id: I170c63ce258dffb04a62ce25e8e9a418e3c594a3
2019-05-20 05:46:11 -07:00
Android Build Merger (Role)
783f4be8b1
Merge "Merge "Revise metrics for emergency dialer" into qt-dev am: 49444bac56" into qt-dev-plus-aosp
2019-05-20 12:38:35 +00:00
Leo Hsu
df46b70299
Merge "Revise metrics for emergency dialer" into qt-dev
...
am: 49444bac56
Change-Id: I3d20f92e31c4daecd5e33d6d1b38952faaec5991
2019-05-20 05:37:40 -07:00
Lorenzo Colitti
10ddc681cf
Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." am: 51164c16aa
...
am: 43089979c3
Change-Id: I19c7ecdaf5658f6464d6b04d3332f7a5ae25a341
2019-05-20 05:36:27 -07:00
Narayan Kamath
bb69ce930e
Merge "SettingsLib: Add an API method to query whether a package is a system module." into qt-dev
...
am: e1bbd0b1d2
Change-Id: I21b731193bf433c739b811a4d709b3ae34725184
2019-05-20 05:29:56 -07:00
Lorenzo Colitti
43089979c3
Merge "Add a factoryReset method to IIpMemoryStore, and freeze api."
...
am: 51164c16aa
Change-Id: Id73a9ffea21c3e03a9946b9f5425a7781b8c11f5
2019-05-20 05:23:52 -07:00
Narayan Kamath
309228c28a
Merge "Changes to MediaProjection UX." into qt-dev
...
am: 7b25470fd9
Change-Id: I273ae95ae8c4ad6245cfe79fffe9d02c85ed13cf
2019-05-20 05:23:20 -07:00
Andrii Kulian
859f0a543f
Revert "Set parent for WindowProcessController"
...
This reverts commit 33ab86910e .
Reason for revert: b/132986140
Bug: 132986140
Bug: 131915789
Change-Id: I75824cd02d4c6a557c6997ebca01354155f8cd93
2019-05-20 12:19:33 +00:00
Andrii Kulian
beadaccfc4
Revert "Override process config for cold start on secondary screens"
...
This reverts commit ceef7461c2 .
Reason for revert: b/132986140
Bug: 132986140
Bug: 131915789
Change-Id: I95b28fb4d5eca1927be213e070177f8f3626d9b7
2019-05-20 12:19:28 +00:00
Jin Seok Park
862e793d83
Merge "Change warning logs to debug logs" into qt-dev
...
am: e827932a9c
Change-Id: Ice2b273b0b5e43b5c6c590edf45644e8f1e67fb6
2019-05-20 05:19:05 -07:00
Christine Franks
aa1e335fa3
Merge "Support vendor color modes for sf mode sysprop" into qt-dev
...
am: abc726ec50
Change-Id: Ib53aeb70b45c6a56bfe8c16c8412a6e742d89492
2019-05-20 05:12:32 -07:00
Lorenzo Colitti
51164c16aa
Merge "Add a factoryReset method to IIpMemoryStore, and freeze api."
2019-05-20 12:09:02 +00:00
Bill Yi
4e51bc3911
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 72ecec0909 -s ours
...
am: e3710a3624 -s ours
am skip reason: subject contains skip directive
Change-Id: I06f61c1567174b6b15dd1b509a55521ca776b544
2019-05-20 04:56:11 -07:00
Bill Yi
f61086485c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d0461a536c -s ours
am skip reason: subject contains skip directive
Change-Id: I877933df5ac53dc38eac4d0cd765f5453a9790bd
2019-05-20 04:55:25 -07:00
yj81.kwon
b2f088409b
Merge "[wm]: Fixed TaskPositioner leak" into qt-dev
...
am: 050d6df74c
Change-Id: Ife9c5d5da6fae4d40183a6a56a71165001bf6674
2019-05-20 04:54:49 -07:00
Mill Chen
28e8f9f365
Add 2 attributes for list_divider_material
...
We added two attributes for list divider, one gets set up the color of list
divider and the other gets set up the opacity of its color. This
approach facilitates updating the color of the list divider for device
default themes.
Bug: 129943610
Test: visual
Change-Id: Ia319a31e223a86d71720e2dab63dce200ca824df
2019-05-20 19:51:11 +08:00
Zimuzo Ezeozue
29d9b1d9b2
Merge "Fix handling multiple staged rollback sessions ready signal" into qt-dev
...
am: b6c55dfa54
Change-Id: Ieb53ea67b9358dcdf732bf2959b4d015f1975441
2019-05-20 04:50:33 -07:00
Steve Elliott
50ad8d1014
Merge "Fix dropped rotation events when unlocking orientation" into qt-dev
...
am: a129679d8f
Change-Id: I8157397d55189dee92fc8a63b6908fe0827594e8
2019-05-20 04:46:07 -07:00
Winson Chung
eb84644abd
Merge "Fix issue with wrong user task being resolved" into qt-dev
...
am: 84ac023b8a
Change-Id: If206c986e5bbb1aa53ecf9e5dabcc481b066cd93
2019-05-20 04:41:41 -07:00
Josh Tsuji
ab26236c60
Merge "Revert "Align bubble behavior with DND settings."" into qt-dev
...
am: 7c36e75d6b
Change-Id: I580ac6c2f243ab044b9acc3b0eb3a965624e2f0d
2019-05-20 04:36:33 -07:00
Govinda Wasserman
6d055c6063
Merge "Adds a PhoneStateMonitor to the AssistManager" into qt-dev
...
am: 5d9fede666
Change-Id: I34731c170afb7c09421959fe07c8e06909bdde16
2019-05-20 04:31:42 -07:00
Bill Yi
ee507cda32
[automerger skipped] Import translations. DO NOT MERGE am: d1ab5aced6 -s ours
...
am: 162dbaa3e4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8ec59729ae9ac9d335c9ea12c30160b7493f6ee1
2019-05-20 04:27:16 -07:00
Kweku Adams
fc215094d0
Merge "Add throttling by job run session." into qt-dev
...
am: faeb669165
Change-Id: I88ea68db19c32ddc79a9d95c764b546a2f2d2e26
2019-05-20 04:26:37 -07:00
Bill Yi
afd4ef1d08
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 3b7a08e360 -s ours
am skip reason: subject contains skip directive
Change-Id: Id3eeed6a368072136959013b03f8dc1a6cf79793
2019-05-20 04:22:24 -07:00
Winson Chung
e6cdb8e39a
Merge "Ensure that we use the current user context when adding nav mode listeners" into qt-dev
...
am: d76c0d751a
Change-Id: I0c05912150f179db80fc88a392ed9a406c6fff01
2019-05-20 04:21:46 -07:00
Beverly
b56307ac12
Merge "Allow updates to importance of default apps" into qt-dev
...
am: ad204b6edc
Change-Id: I4cbdee6661883bec8653da5b1f020f357db794d5
2019-05-20 04:17:18 -07:00
Matt Casey
d7ed2f7241
Merge "Remove assist status stuff from StatusBar." into qt-dev
...
am: a3e45d5d26
Change-Id: I1d2c0472bdae7d9b5d188887bedf03cba4938876
2019-05-20 04:12:26 -07:00
Jiyong Park
ff7b4c700f
Merge "Add workaround for b/124210145" into qt-dev
...
am: a8cf106193
Change-Id: I393606e9962aa494dff32ab64cab35333acdd37a
2019-05-20 03:59:22 -07:00
Remi NGUYEN VAN
8600673c5d
Merge "Add dumpsys network_stack version" into qt-dev
2019-05-20 10:00:24 +00:00
Ben Murdoch
ffc816283e
Merge "Add Standby Bucket and job duration to ScheduledJobStateChanged atom." into qt-dev
2019-05-20 08:18:34 +00:00
TreeHugger Robot
49444bac56
Merge "Revise metrics for emergency dialer" into qt-dev
2019-05-20 08:16:09 +00:00
Remi NGUYEN VAN
8ef722a970
Add dumpsys network_stack version
...
This is necessary to allow testing for the network stack version and the
version it is getting from the system server.
Test: flashed, WiFi working
Test: dumpsys network_stack version shows data (although version numbers
being fixed)
Bug: 133124190
Change-Id: I9ea85c29667d4510225637071990732360841db6
2019-05-20 16:47:48 +09:00
Lorenzo Colitti
91dd063172
Add a factoryReset method to IIpMemoryStore, and freeze api.
...
Currently unimplemented. Implementation will be in a future CL.
Test: m
Bug: 128499160
Change-Id: Ia11ecd33f528d01667b1baeb8671b7213a31eef5
2019-05-20 16:43:23 +09:00
Narayan Kamath
e1bbd0b1d2
Merge "SettingsLib: Add an API method to query whether a package is a system module." into qt-dev
2019-05-20 07:42:53 +00:00
Narayan Kamath
7b25470fd9
Merge "Changes to MediaProjection UX." into qt-dev
2019-05-20 07:41:48 +00:00