OSDN Git Service
Matt Casey [Thu, 30 May 2019 22:43:22 +0000 (15:43 -0700)]
Merge "Fixes test that is currently failing" into qt-dev am:
20a2e7ae2f
am:
0d60b4c868
Change-Id: Ic6ee0fdc207453a39c7b463feba86f8f3714f0ef
Android Build Merger (Role) [Thu, 30 May 2019 22:41:50 +0000 (22:41 +0000)]
Merge "Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a am:
92d3ac8a7e" into qt-r1-dev-plus-aosp
Etan Cohen [Thu, 30 May 2019 22:41:10 +0000 (15:41 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev am:
08236f3d3a
am:
92d3ac8a7e
Change-Id: Ibe283ce1f27398a59be6de2bd5a8052bb70c9657
Evan Rosky [Thu, 30 May 2019 22:40:44 +0000 (15:40 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244
am:
841ef9cd13
Change-Id: Ida54d74ef9637d8e8a4ea1d1912386b9014e0269
Evan Rosky [Thu, 30 May 2019 22:37:51 +0000 (15:37 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev am:
ed057ab244
am:
e06bed8570
Change-Id: I9189fc97df443bb0b388c4bc05396b8bb35628c4
Matt Casey [Thu, 30 May 2019 22:35:15 +0000 (15:35 -0700)]
Merge "Fixes test that is currently failing" into qt-dev
am:
20a2e7ae2f
Change-Id: Id78942cc57c075f983984bb39da969e505938781
Etan Cohen [Thu, 30 May 2019 22:33:43 +0000 (15:33 -0700)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev
am:
08236f3d3a
Change-Id: I67f895f5bb227749edcdc859007622f0ac77723b
Evan Rosky [Thu, 30 May 2019 22:29:43 +0000 (15:29 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev
am:
ed057ab244
Change-Id: I3f127cf09d2ac6340095121a36795a59e1d5a94a
Evan Rosky [Thu, 30 May 2019 22:29:42 +0000 (15:29 -0700)]
Merge "Take snapshot directly during change transition" into qt-dev
am:
ed057ab244
Change-Id: Ia08d8a9f04866e0e9b872f17ca49d049f9499fbb
Matt Casey [Thu, 30 May 2019 22:23:37 +0000 (22:23 +0000)]
Merge "Fixes test that is currently failing" into qt-dev
Govinda Wasserman [Thu, 30 May 2019 17:24:24 +0000 (13:24 -0400)]
Fixes test that is currently failing
Refactors yesterday caused tests to fail because of dependencies getting
initialized earlier. Refactored so that they are initialized late enough
for the tests to be able to mock them correctly.
Also fixes bug where handles would still show when there was no
Assistant.
Test: atest AssistHandleBehaviorControllerTest
BUG:
132424950
Fixes:
134086503
Change-Id: I645a2529bf56b5e996e8250267ead87bed9f4f2b
FIX:
132424950
Etan Cohen [Thu, 30 May 2019 22:16:09 +0000 (22:16 +0000)]
Merge "Modify Encrypted IMSI, remove deprecated protocols" into qt-dev
Evan Rosky [Thu, 30 May 2019 22:11:37 +0000 (22:11 +0000)]
Merge "Take snapshot directly during change transition" into qt-dev
Siarhei Vishniakou [Thu, 30 May 2019 22:00:29 +0000 (15:00 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0
am:
662c41bf53
Change-Id: I36881a92fa2fbf5520b275a5537110bfef8ab737
Siarhei Vishniakou [Thu, 30 May 2019 21:57:43 +0000 (14:57 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev am:
2fb4cb55f0
am:
7e2a341ee1
Change-Id: I19cbf07377642670059add0d27ffe7011a830f4b
Jeff Sharkey [Thu, 30 May 2019 21:55:30 +0000 (14:55 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca
am:
192467bd3f
Change-Id: I3016b17c3a15b39b496b54820b0be794f46b4379
Siarhei Vishniakou [Thu, 30 May 2019 21:52:39 +0000 (14:52 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
am:
2fb4cb55f0
Change-Id: Ia2b1bcb2c98adac680bbe223b8818b1a62338132
Jeff Sharkey [Thu, 30 May 2019 21:51:08 +0000 (14:51 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev am:
c4289bdeca
am:
143cc83668
Change-Id: Ied9429c09214424ead9764a6f54088c281dbe70b
Siarhei Vishniakou [Thu, 30 May 2019 21:47:37 +0000 (14:47 -0700)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
am:
2fb4cb55f0
Change-Id: I1f638492b1be20670d2379da073519348a08e9fd
Jeff Sharkey [Thu, 30 May 2019 21:45:29 +0000 (14:45 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev
am:
c4289bdeca
Change-Id: I914cfab337d18461321fff5ca3bcdb4a53be8e63
Jeff Sharkey [Thu, 30 May 2019 21:43:33 +0000 (14:43 -0700)]
Merge "Shift call statistics back to the original caller." into qt-dev
am:
c4289bdeca
Change-Id: I483473d7a65cde8269b2c4b75abe1a0c49ef1620
TreeHugger Robot [Thu, 30 May 2019 21:42:27 +0000 (21:42 +0000)]
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
Mehdi Alizadeh [Thu, 30 May 2019 21:35:44 +0000 (14:35 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6
am:
71cb077172
Change-Id: I02b89888bfeeb5b3797890f85215630c9ff1209b
Colin Cross [Thu, 30 May 2019 21:33:42 +0000 (14:33 -0700)]
[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am:
d0de38b222 am:
ec3a29c544 -s ours
am:
58fa5df312 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1
fdec9ffee0 is in history
Change-Id: I0d7216679a26ca84a3a7362354cedeef88e0ac60
Mehdi Alizadeh [Thu, 30 May 2019 21:29:54 +0000 (14:29 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev am:
32d97863d6
am:
0fd238797f
Change-Id: I8118bd8db631f96a3e428b6e39b7bef522c42b82
Jeff Sharkey [Thu, 30 May 2019 21:29:21 +0000 (21:29 +0000)]
Merge "Shift call statistics back to the original caller." into qt-dev
Colin Cross [Thu, 30 May 2019 21:25:30 +0000 (14:25 -0700)]
[automerger skipped] Merge "Convert SettingsLib tests to Android.bp" am:
d0de38b222
am:
ec3a29c544 -s ours
am skip reason: change_id I69b5b2c6c22f93a31ef978710867226cb1ba3db0 with SHA1
fdec9ffee0 is in history
Change-Id: Ic2d055ddf34ad5fa1f91dca761f23b8c8cc9f3c0
Mehdi Alizadeh [Thu, 30 May 2019 21:22:19 +0000 (14:22 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
am:
32d97863d6
Change-Id: I021814ff3030d9821ef8de1385b66f0b28278686
Mehdi Alizadeh [Thu, 30 May 2019 21:22:18 +0000 (14:22 -0700)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
am:
32d97863d6
Change-Id: Ic6d507eed5cdcb6ed3c35847640ea13c30bf31c6
Anders Fridlund [Thu, 30 May 2019 21:18:06 +0000 (14:18 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920
am:
8c6fbc6110
Change-Id: I711521f58b855a5aee26568db1cbc1cca2884ddb
Colin Cross [Thu, 30 May 2019 21:14:23 +0000 (14:14 -0700)]
Merge "Convert SettingsLib tests to Android.bp"
am:
d0de38b222
Change-Id: I2b41c0d12dc70102e4c620a61e5d9fc2706a881b
Android Build Merger (Role) [Thu, 30 May 2019 21:13:50 +0000 (21:13 +0000)]
Merge "Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d am:
9fe268ccfd" into qt-r1-dev-plus-aosp
Mehdi Alizadeh [Thu, 30 May 2019 21:13:08 +0000 (21:13 +0000)]
Merge "Adds strings for notifications when default launcher changes" into qt-dev
Makoto Onuki [Thu, 30 May 2019 21:12:22 +0000 (14:12 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d
am:
9fe268ccfd
Change-Id: I533e4938fa667f3c3037b14d37d26d628b844ca6
Anders Fridlund [Thu, 30 May 2019 21:11:20 +0000 (14:11 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev am:
36e3da7920
am:
0dd52a5985
Change-Id: I4193bb1920e1f42a4b3737b10266c8bc88c91a37
Colin Cross [Thu, 30 May 2019 21:08:52 +0000 (21:08 +0000)]
Merge "Convert SettingsLib tests to Android.bp"
Makoto Onuki [Thu, 30 May 2019 21:08:00 +0000 (14:08 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev am:
70554da78d
am:
6550afbe33
Change-Id: I7f8d84bba6b516d91303344c1b62f132c923ade6
Anders Fridlund [Thu, 30 May 2019 21:01:50 +0000 (14:01 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev
am:
36e3da7920
Change-Id: Idbdc8e24d7d986a0a785965f534c65f1add847a8
Anders Fridlund [Thu, 30 May 2019 20:59:26 +0000 (13:59 -0700)]
Merge "Look for bootanimation in apex-module" into qt-dev
am:
36e3da7920
Change-Id: Ib37abe37122d14a2e3d3a4ecaae5c24a23ba9992
Makoto Onuki [Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev
am:
70554da78d
Change-Id: I38bcfdf34ba0ff6c805f1909a2844d2a57835712
Makoto Onuki [Thu, 30 May 2019 20:53:53 +0000 (13:53 -0700)]
Merge "Add one more config resource for contacts provider" into qt-dev
am:
70554da78d
Change-Id: I8a9197a4b3b7b0ae85cf624ca1815c418bd94588
Varun Anand [Thu, 30 May 2019 20:47:41 +0000 (13:47 -0700)]
[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am:
b50e778fa7 am:
9561790069 -s ours
am:
84a4f3e962 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1
1419b0b20e is in history
Change-Id: I982ce55558624e26531695abf09e3108b2463780
TreeHugger Robot [Thu, 30 May 2019 20:37:19 +0000 (20:37 +0000)]
Merge "Look for bootanimation in apex-module" into qt-dev
Makoto Onuki [Thu, 30 May 2019 20:33:06 +0000 (20:33 +0000)]
Merge "Add one more config resource for contacts provider" into qt-dev
Varun Anand [Thu, 30 May 2019 20:26:09 +0000 (13:26 -0700)]
[automerger skipped] Merge changes from topic "vpn_data_accn_tests" am:
b50e778fa7
am:
9561790069 -s ours
am skip reason: change_id Iffd3f95fc2e11d311691a797b010edb38d2ef3c6 with SHA1
1419b0b20e is in history
Change-Id: I86c99de74590e3ad54055a16b5c349b6ba3659ab
Matt Casey [Thu, 30 May 2019 20:22:19 +0000 (13:22 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881
am:
bf5a232744
Change-Id: I3f50dae4c226630fbf45554cf623a7f8515a4688
Priyank Singh [Thu, 30 May 2019 20:20:35 +0000 (13:20 -0700)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4
am:
5dba9060ad
Change-Id: I7bac30948a62ef27b9c4c5252ff1748fe4b5022e
Priyank Singh [Thu, 30 May 2019 20:19:11 +0000 (13:19 -0700)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65
am:
77d976491c
Change-Id: I6e952c6192401fe860c835f84118b8c8999474c4
Julia Reynolds [Thu, 30 May 2019 20:16:55 +0000 (13:16 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev am:
58cfefe9cc
am:
8c3767aba8
Change-Id: I8c672ddbfcbf1aeaaf5f5694c7d951bead8c5ac3
Jean-Michel Trivi [Thu, 30 May 2019 20:14:40 +0000 (13:14 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev am:
3de2438d5c
am:
e0cc30bcb8
Change-Id: I3ef3864e052201a3249acddf20f9804710b0619c
Robert Carr [Thu, 30 May 2019 20:11:47 +0000 (13:11 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours am:
cd43a5f7ad
am:
d6d018e3dc
Change-Id: Ic5614e7c1fbe6abbccb98b0d75de1adddce9ed39
Varun Anand [Thu, 30 May 2019 20:11:03 +0000 (13:11 -0700)]
Merge changes from topic "vpn_data_accn_tests"
am:
b50e778fa7
Change-Id: I52f55fe3ddcd06de6219078dd300f0995972100c
Matt Casey [Thu, 30 May 2019 20:08:39 +0000 (13:08 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
am:
c71c7fe881
Change-Id: Ie4c997b705ca56e10640f63d12d2ff8be0adaf09
Matt Casey [Thu, 30 May 2019 20:08:24 +0000 (13:08 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev am:
c71c7fe881
am:
f3534200b5
Change-Id: I34c8b24cc1a97ccc3e61e7911ad2bf3708a132fe
Android Build Merger (Role) [Thu, 30 May 2019 19:59:55 +0000 (19:59 +0000)]
Merge "Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb am:
8104d693d6" into qt-r1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 May 2019 19:59:06 +0000 (19:59 +0000)]
Merge "Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4 am:
77667ce117" into qt-r1-dev-plus-aosp
Leon Scroggins [Thu, 30 May 2019 19:58:32 +0000 (12:58 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb
am:
8104d693d6
Change-Id: I889783e5b690b5aad6865bbfc0ccdbc185dd7a05
Priyank Singh [Thu, 30 May 2019 19:58:15 +0000 (12:58 -0700)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev am:
5a0b7e59c4
am:
77667ce117
Change-Id: I694dadc2851cbb5edc4c5806ad01404690b7d46e
Android Build Merger (Role) [Thu, 30 May 2019 19:58:04 +0000 (19:58 +0000)]
Merge "Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am:
06cbf65704 am:
65cba0fa32" into qt-r1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 May 2019 19:57:25 +0000 (19:57 +0000)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65 am:
793cf2ee37" into qt-r1-dev-plus-aosp
Josh Tsuji [Thu, 30 May 2019 19:57:22 +0000 (12:57 -0700)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am:
06cbf65704
am:
65cba0fa32
Change-Id: I86cbac526fdb1e71cb70d4545a5c60d11d3e14b5
Android Build Merger (Role) [Thu, 30 May 2019 19:57:16 +0000 (19:57 +0000)]
Merge "Merge "Add Usage info for LocationManager's APIs" into qt-dev am:
11ddc8ea0b am:
4e5d2a48c1" into qt-r1-dev-plus-aosp
Priyank Singh [Thu, 30 May 2019 19:56:35 +0000 (12:56 -0700)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar" am:
a6c1e6ab65
am:
793cf2ee37
Change-Id: I1b899b0172b2b92425a9d5058cbc2ad04965d265
Matt Casey [Thu, 30 May 2019 19:56:28 +0000 (12:56 -0700)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
am:
c71c7fe881
Change-Id: I81d7b76ba91b00dd547378b640fa9545dadf6458
Hongyi Zhang [Thu, 30 May 2019 19:56:25 +0000 (12:56 -0700)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev am:
11ddc8ea0b
am:
4e5d2a48c1
Change-Id: I97b4ab6c3d2362e17a02b0325604d473aee9f5dc
Android Build Merger (Role) [Thu, 30 May 2019 19:56:18 +0000 (19:56 +0000)]
Merge "Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am:
6f24b88c71 am:
07917b9ee5" into qt-r1-dev-plus-aosp
Winson Chung [Thu, 30 May 2019 19:55:27 +0000 (12:55 -0700)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am:
6f24b88c71
am:
07917b9ee5
Change-Id: I08ff3643602a10b992505a4c4171a260e6f8d111
Julia Reynolds [Thu, 30 May 2019 19:54:54 +0000 (12:54 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev am:
58cfefe9cc
am:
9cdc4fa314
Change-Id: I659b88e2cab36ba0d4eedcf87428d31464257b43
Jean-Michel Trivi [Thu, 30 May 2019 19:53:09 +0000 (12:53 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev am:
3de2438d5c
am:
3222703156
Change-Id: I9b32646623d6ba433151578bfdfac216f478a36e
Priyank Singh [Thu, 30 May 2019 19:51:41 +0000 (12:51 -0700)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
am:
5a0b7e59c4
Change-Id: I80385fdfad729c1fe657fe892a6e56e96c3f37a9
Priyank Singh [Thu, 30 May 2019 19:51:39 +0000 (12:51 -0700)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
am:
a6c1e6ab65
Change-Id: I005f798dd086e212c56c8060c204f4a59357176b
Robert Carr [Thu, 30 May 2019 19:51:25 +0000 (12:51 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours am:
cd43a5f7ad
am:
6e373387c8
Change-Id: Ic68bc60962afcd4c438e05e5a7ec5b19bbda0759
Julia Reynolds [Thu, 30 May 2019 19:50:03 +0000 (12:50 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev
am:
58cfefe9cc
Change-Id: If7e069985f430a1776acdd20b2152d2202fbfdf5
Jean-Michel Trivi [Thu, 30 May 2019 19:48:25 +0000 (12:48 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev
am:
3de2438d5c
Change-Id: Id3c951bff43330450e53439d68634d96a3a64802
Leon Scroggins [Thu, 30 May 2019 19:47:11 +0000 (12:47 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev am:
9be1d08acb
am:
0a9b7b4fca
Change-Id: Iecdfdb60de7fe259c28bdbd845234421440b3cc0
Robert Carr [Thu, 30 May 2019 19:46:56 +0000 (12:46 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours
am:
cd43a5f7ad
Change-Id: Id6a0704fb372b9ad34dfc4302f7b9a3621ab1e33
Josh Tsuji [Thu, 30 May 2019 19:45:58 +0000 (12:45 -0700)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev am:
06cbf65704
am:
4aed7e0cb1
Change-Id: I6c570f2d2957593cba55acbafff1ff5dd0ff01d1
Hongyi Zhang [Thu, 30 May 2019 19:45:18 +0000 (12:45 -0700)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev am:
11ddc8ea0b
am:
98eed7dcca
Change-Id: I3052da34a504150860f9b799266ff9af595cac7b
Winson Chung [Thu, 30 May 2019 19:44:23 +0000 (12:44 -0700)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev am:
6f24b88c71
am:
34d893c490
Change-Id: Id769d64f61f26e55d911e144d43591cb89604a11
Leon Scroggins [Thu, 30 May 2019 19:41:09 +0000 (12:41 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
am:
9be1d08acb
Change-Id: I4e15a3432307fe2c17bcd345d53942d7f14a33a4
Josh Tsuji [Thu, 30 May 2019 19:39:53 +0000 (12:39 -0700)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
am:
06cbf65704
Change-Id: I666d3b5b62514410a651d914271b664370c67f84
Hongyi Zhang [Thu, 30 May 2019 19:39:03 +0000 (12:39 -0700)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev
am:
11ddc8ea0b
Change-Id: I048d9b1fec5120a268a56693cdface47c1cc08c9
Matt Casey [Thu, 30 May 2019 19:38:38 +0000 (19:38 +0000)]
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
Winson Chung [Thu, 30 May 2019 19:38:18 +0000 (12:38 -0700)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
am:
6f24b88c71
Change-Id: I89e0c654d7d4ecf3f6d7a19c4fc811d408c44894
Priyank Singh [Thu, 30 May 2019 19:37:04 +0000 (12:37 -0700)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
am:
5a0b7e59c4
Change-Id: I0406800cb9b5848b5c85d223564952b5c13e38f0
Priyank Singh [Thu, 30 May 2019 19:37:02 +0000 (12:37 -0700)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
am:
a6c1e6ab65
Change-Id: I92b9859990cdc6103eaa8d280b94befe07a6af38
Varun Anand [Thu, 30 May 2019 19:34:28 +0000 (19:34 +0000)]
Merge changes from topic "vpn_data_accn_tests"
* changes:
Add one more test for VPN usage stats.
Addressing comments for http://ag/
7700679.
TreeHugger Robot [Thu, 30 May 2019 19:20:20 +0000 (19:20 +0000)]
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
Priyank Singh [Thu, 30 May 2019 01:09:35 +0000 (01:09 +0000)]
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
This reverts commit
5bd5767768a9dc0a0d2972239fbfd2f68258cfd9.
Reason for revert: We want to delete all the code related to privacy chip/indicator from Q as of now. b/
132292477
Bug:
133898491
Change-Id: Ieddae7509d918ab63a5b3111e0efc623fae644b3
Julia Reynolds [Thu, 30 May 2019 19:02:39 +0000 (12:02 -0700)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev
am:
58cfefe9cc
Change-Id: I33edb17dfdd3c875edd34be56470dd079ee33c6f
Mehdi Alizadeh [Thu, 30 May 2019 03:37:27 +0000 (20:37 -0700)]
Adds strings for notifications when default launcher changes
Bug:
129532605
Test: None
Change-Id: Ie85dfc704939db217c9b59724e0a586020aaa797
Jean-Michel Trivi [Thu, 30 May 2019 18:59:24 +0000 (11:59 -0700)]
Merge "AudioService: remove dead BT code" into qt-dev
am:
3de2438d5c
Change-Id: I99388c3ec13278731b2e403aa308c2eb8131da21
Robert Carr [Thu, 30 May 2019 18:57:51 +0000 (11:57 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am:
fbc22c2b6d -s ours
am:
cd43a5f7ad
Change-Id: Ifb40223f91ab0eb58d97c2e52d60fb3e6d52fd4c
Leon Scroggins [Thu, 30 May 2019 18:55:02 +0000 (11:55 -0700)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
am:
9be1d08acb
Change-Id: I01582c19eee9b0aedde169b632384ed60c680f09
Josh Tsuji [Thu, 30 May 2019 18:53:30 +0000 (11:53 -0700)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
am:
06cbf65704
Change-Id: I5bbfb0ec91ab5ae8760a8208b9d3a967103df999
TreeHugger Robot [Thu, 30 May 2019 18:53:13 +0000 (18:53 +0000)]
Merge "Fix a11y readout of notification guts buttons" into qt-dev
TreeHugger Robot [Thu, 30 May 2019 18:36:34 +0000 (18:36 +0000)]
Merge "AudioService: remove dead BT code" into qt-dev
Robert Carr [Thu, 30 May 2019 18:35:37 +0000 (11:35 -0700)]
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI
am:
fbc22c2b6d -s ours
am skip reason: subject contains skip directive
Change-Id: Iedd5183586ec5b13c71ae943c3ff877e5c98311e
Leon Scroggins [Thu, 30 May 2019 18:31:40 +0000 (18:31 +0000)]
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
Josh Tsuji [Thu, 30 May 2019 18:23:26 +0000 (18:23 +0000)]
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
* changes:
Fix issues with animations when the stack is expanded.
Prevent a crash when touching the stack while it's flinging out of the dismiss area.
Remove the max rendered children code.
Stability and logic fixes to PhysicsAnimationLayout to address bugs that leave Bubbles in a bad state.