86a46bbf80
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: a3981e236a -s ours am: 50f6b92d4c -s ours am: 2e491e9670 -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 10:20:07 +00:00
479bd99fc6
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: bf72002d28 -s ours am: 139362517c -s ours am: 344739ae2f -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 10:19:39 +00:00
2e491e9670
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: a3981e236a -s ours am: 50f6b92d4c -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:56:31 +00:00
344739ae2f
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: bf72002d28 -s ours am: 139362517c -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:56:07 +00:00
50f6b92d4c
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: a3981e236a -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:33:25 +00:00
139362517c
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours am: bf72002d28 -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:33:15 +00:00
a3981e236a
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:06:08 +00:00
bf72002d28
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours am: 670efff389 -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 09:06:05 +00:00
670efff389
[automerger skipped] Fixes ag/10573640 on qt-future-dev branch. am: 66dc70c91b -s ours
...
am skip reason: Change-Id Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a with SHA-1 ecf9323831
2020-03-24 08:51:04 +00:00
66dc70c91b
Fixes ag/10573640 on qt-future-dev branch.
...
Original qt-future-dev change was ag/10601877.
The change needed to be in UiFactory, not RecentsUiFactory.
Fixes: 146593239
Test: Installed NexusLauncherDebug on a QD4A build and
tried the repo steps. Also built other launcher variants.
Merged-In: Ib9c85de2f83f99d1ef53fb17fde5d0b3c514849a
Change-Id: I802e2b0069a19ca62a08325bb6d0de5275c43c9b
2020-03-24 04:54:04 +00:00
b021e7d3e5
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 898e80aa10 am: 3cdaba0030 am: 0c31032677 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3663f5cea93d9383e0899182c3aae6b1ee2f10bb
2020-03-24 04:38:43 +00:00
2b047ddb70
Merge "[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980" into rvc-d1-dev-plus-aosp am: 02c3d0ee40 am: 1272929533 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2a227bc60bdb13bc5c029b050514e3fa3b81fe2e
2020-03-24 04:38:11 +00:00
eb242fb696
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980 am: e8ca822cfd am: c559777b16 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I187b6c84ff04fef6976020c6fecaa7fd23f536b3
2020-03-24 04:38:09 +00:00
0c31032677
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 898e80aa10 am: 3cdaba0030
...
Change-Id: I9a31e2178329fca6bce2a98aaa14bc6aef69d1ab
2020-03-24 04:37:58 +00:00
6260cfb33d
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 00d8ef98d5 am: 01a6aa099d -s ours
...
am skip reason: subject contains skip directive
Change-Id: If6ca26a011c751c27080328990847611a1f8c231
2020-03-24 04:37:38 +00:00
1272929533
Merge "[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980" into rvc-d1-dev-plus-aosp am: 02c3d0ee40
...
Change-Id: I7571ab56dd22a2bbca69a7f33ee7e008ee214170
2020-03-24 04:18:37 +00:00
c559777b16
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980 am: e8ca822cfd
...
Change-Id: I679d8c646c077bca5858533c0c0e7bb148dd21d5
2020-03-24 04:18:35 +00:00
01a6aa099d
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 00d8ef98d5
...
Change-Id: I7a9474a95dcbc898d43032cdc60153366aced241
2020-03-24 04:17:53 +00:00
3cdaba0030
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 898e80aa10
...
Change-Id: Ie2d511ca5a2e1112294e72920531d61233ec2983
2020-03-24 04:17:13 +00:00
02c3d0ee40
Merge "[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980" into rvc-d1-dev-plus-aosp
2020-03-24 04:07:08 +00:00
e8ca822cfd
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980
...
Change-Id: Ibcbc34643516ff5dea7038a9917d2beb066483ea
2020-03-24 04:07:04 +00:00
898e80aa10
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e
...
Change-Id: I6f499812eb59c1ef90a3d02110e38619839d390e
2020-03-24 04:07:03 +00:00
00d8ef98d5
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e
...
Change-Id: I9317e801555dd50cf63fcf182e46a0034cfdb2f9
2020-03-24 04:07:00 +00:00
c81d9e4980
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf
...
Change-Id: If9c7cb8645ca52d0850080c0d071cd4959553be2
2020-03-24 03:50:25 +00:00
65166f688e
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf
...
Change-Id: I2d434536b2da44d91ac72626abf0b4131d2d7d5a
2020-03-24 03:50:17 +00:00
9e270a4daf
[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I75143a0693eed5d8d40ce3e10acf96ff68017f7a
2020-03-24 03:30:40 +00:00
ed538e53b0
[DO NOT MERGE] Adds basic smart-folder logging.
...
This would allow collecting trimmed down version of smart-folder logs from QPR devices.
Change-Id: Ida332bd969774cabcfd72def5bed0e6409d6c8e1
(cherry picked from commit d684eddd9f
2020-03-23 23:11:41 +00:00
7523c8bab0
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: 79aa1637a8 am: 70e0b888b6 am: b9a8f54a36 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I43c9360ad9be56e76e0ed25b7b286e2ff01672f9
2020-03-21 03:55:09 +00:00
c099124ecf
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b am: 462f9fe0ad am: c6b1e463a2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia7ed25684b708209f531a908497d697a5f9bd05f
2020-03-21 03:55:02 +00:00
c2f26c2a67
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: acad4f578b am: e43dedab9d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4b98d69c6652527ffb1834f20d68fd8063c6031a
2020-03-21 03:54:56 +00:00
b9a8f54a36
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: 79aa1637a8 am: 70e0b888b6
...
Change-Id: Iea5b9aa90027e8a7ea0dcc4c3ad16ae9554cd3ab
2020-03-21 03:45:33 +00:00
c6b1e463a2
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b am: 462f9fe0ad
...
Change-Id: I099b9c615f351aa6584fa647e0636b51e203cee1
2020-03-21 03:30:22 +00:00
70e0b888b6
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: 79aa1637a8
...
Change-Id: I28d71fb50d783cdddc50ecc212c72c7a3bdf1bc2
2020-03-21 03:30:06 +00:00
e43dedab9d
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d am: acad4f578b
...
Change-Id: Ib495a1bca3192dbe0ca8fd00ca5c01d65dca2c6b
2020-03-21 03:30:01 +00:00
79aa1637a8
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d
...
Change-Id: I05294a3b59df128859a84838c2a26b2bd12e679d
2020-03-21 03:13:26 +00:00
462f9fe0ad
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b
...
Change-Id: I057a073622a0c5a19ea8e7b822930cfb51e90a19
2020-03-21 03:13:14 +00:00
acad4f578b
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 0869bbf43d
...
Change-Id: I2e92d3cacee2c3e2845e35401e60b6aee97ed41b
2020-03-21 03:12:51 +00:00
29c4e7949b
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e
...
Change-Id: Ibe2b0b5318210959e19de141c15dbc3926cbcd91
2020-03-21 02:59:45 +00:00
0869bbf43d
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e
...
Change-Id: I73c712c430d87d9998af657ede1dd94976a27c4f
2020-03-21 02:59:01 +00:00
6b516bd63e
[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic81a7691c525dfefa0a144364953c20aede0a65c
2020-03-21 02:41:11 +00:00
985639b823
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861 am: a815250b76 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifa7b6ec57c327f47b6007fcbe32299be00e12780
2020-03-20 23:24:29 +00:00
a815250b76
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861
...
Change-Id: I917fde089ee793ae089d6a8d5a99375bfb80bc15
2020-03-20 22:33:36 +00:00
3b5f2224c6
[DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims
...
Add wallpaper changed broadcast receiver to BaseDragLayer, which
checks if the new wallpaper is blacklisted and relays that to
remove the scrims.
Bug: 150144115
Change-Id: I55b7b98fdd419cd76532492461a872367efed67b
(cherry picked from commit d6f917f182
2020-03-20 21:56:18 +00:00
2a85b04ffd
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af am: f7eb87cebd am: 66c4207b8a
...
Change-Id: I3a48e09dd8e6a86b201c2f683c4a7c209fe6ac81
2020-03-20 18:48:12 +00:00
14754e6e3a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 4beb9d1338 am: 70ad7790e6
...
Change-Id: I853022e8ebfba9724d544beb795560757be7281c
2020-03-20 18:45:50 +00:00
69afb6b861
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19
...
Change-Id: Ia1c0e46ad6a624365dfeaff5788012dae31d7819
2020-03-20 18:45:17 +00:00
8bf64ae28a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: b9958da552 am: d214ae4643 am: d90db91522
...
Change-Id: I11ae95de8143b7e90badf4ac222af2a113df5234
2020-03-20 18:45:16 +00:00
66c4207b8a
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 2ddbe4c8af am: f7eb87cebd
...
Change-Id: I30ad926d5c45cdcb2ddae32e67e4b5c0cd561884
2020-03-20 18:42:47 +00:00
70ad7790e6
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: c0eb6269c6 am: 4beb9d1338
...
Change-Id: I7cbc274cbe3bacd568223977556641488deea834
2020-03-20 18:32:53 +00:00
d90db91522
Merge "Update window threshold in both directions" into rvc-dev am: 39cbf97f64 am: b9958da552 am: d214ae4643
...
Change-Id: Iec2591a4dbea777d892de8d46f6835e988921a10
2020-03-20 18:32:39 +00:00
Andy Wickham
thiruram
Automerger Merge Worker
Tony Wickham
Xin Li
Evan Rosky