Evan Rosky
e06bed8570
Merge "Take snapshot directly during change transition" into qt-dev
...
am: ed057ab244
Change-Id: I3f127cf09d2ac6340095121a36795a59e1d5a94a
2019-05-30 15:29:43 -07:00
Evan Rosky
ed057ab244
Merge "Take snapshot directly during change transition" into qt-dev
2019-05-30 22:11:37 +00:00
Siarhei Vishniakou
662c41bf53
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
...
am: 2fb4cb55f0
Change-Id: Ia2b1bcb2c98adac680bbe223b8818b1a62338132
2019-05-30 14:52:39 -07:00
Jeff Sharkey
143cc83668
Merge "Shift call statistics back to the original caller." into qt-dev
...
am: c4289bdeca
Change-Id: I483473d7a65cde8269b2c4b75abe1a0c49ef1620
2019-05-30 14:43:33 -07:00
TreeHugger Robot
2fb4cb55f0
Merge "Use unbatched inputeventreceiver, reduce touchslop" into qt-dev
2019-05-30 21:42:27 +00:00
Jeff Sharkey
c4289bdeca
Merge "Shift call statistics back to the original caller." into qt-dev
2019-05-30 21:29:21 +00:00
Colin Cross
58fa5df312
[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
2019-05-30 14:25:30 -07:00
Mehdi Alizadeh
0fd238797f
Merge "Adds strings for notifications when default launcher changes" into qt-dev
...
am: 32d97863d6
Change-Id: I021814ff3030d9821ef8de1385b66f0b28278686
2019-05-30 14:22:19 -07:00
Colin Cross
ec3a29c544
Merge "Convert SettingsLib tests to Android.bp"
...
am: d0de38b222
Change-Id: I2b41c0d12dc70102e4c620a61e5d9fc2706a881b
2019-05-30 14:14:23 -07:00
Mehdi Alizadeh
32d97863d6
Merge "Adds strings for notifications when default launcher changes" into qt-dev
2019-05-30 21:13:08 +00:00
Colin Cross
d0de38b222
Merge "Convert SettingsLib tests to Android.bp"
2019-05-30 21:08:52 +00:00
Anders Fridlund
0dd52a5985
Merge "Look for bootanimation in apex-module" into qt-dev
...
am: 36e3da7920
Change-Id: Ib37abe37122d14a2e3d3a4ecaae5c24a23ba9992
2019-05-30 13:59:26 -07:00
Makoto Onuki
6550afbe33
Merge "Add one more config resource for contacts provider" into qt-dev
...
am: 70554da78d
Change-Id: I8a9197a4b3b7b0ae85cf624ca1815c418bd94588
2019-05-30 13:53:53 -07:00
TreeHugger Robot
36e3da7920
Merge "Look for bootanimation in apex-module" into qt-dev
2019-05-30 20:37:19 +00:00
Makoto Onuki
70554da78d
Merge "Add one more config resource for contacts provider" into qt-dev
2019-05-30 20:33:06 +00:00
Varun Anand
84a4f3e962
[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
2019-05-30 13:26:09 -07:00
Varun Anand
9561790069
Merge changes from topic "vpn_data_accn_tests"
...
am: b50e778fa7
Change-Id: I52f55fe3ddcd06de6219078dd300f0995972100c
2019-05-30 13:11:03 -07:00
Matt Casey
f3534200b5
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
...
am: c71c7fe881
Change-Id: I81d7b76ba91b00dd547378b640fa9545dadf6458
2019-05-30 12:56:28 -07:00
Matt Casey
c71c7fe881
Merge "Hide assist handles during generic assist gesture invocation." into qt-dev
2019-05-30 19:38:38 +00:00
Priyank Singh
77667ce117
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
...
am: 5a0b7e59c4
Change-Id: I0406800cb9b5848b5c85d223564952b5c13e38f0
2019-05-30 12:37:04 -07:00
Priyank Singh
793cf2ee37
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
...
am: a6c1e6ab65
Change-Id: I92b9859990cdc6103eaa8d280b94befe07a6af38
2019-05-30 12:37:02 -07:00
Varun Anand
b50e778fa7
Merge changes from topic "vpn_data_accn_tests"
...
* changes:
Add one more test for VPN usage stats.
Addressing comments for http://ag/7700679 .
2019-05-30 19:34:28 +00:00
TreeHugger Robot
5a0b7e59c4
Merge "DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"" into qt-dev
2019-05-30 19:20:20 +00:00
Priyank Singh
a6c1e6ab65
DO NOT MERGE Revert "Adding the privacy chip to the CarStatusBar"
...
This reverts commit 5bd5767768 .
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
2019-05-30 19:19:34 +00:00
Julia Reynolds
9cdc4fa314
Merge "Fix a11y readout of notification guts buttons" into qt-dev
...
am: 58cfefe9cc
Change-Id: I33edb17dfdd3c875edd34be56470dd079ee33c6f
2019-05-30 12:02:39 -07:00
Mehdi Alizadeh
4a0c923c96
Adds strings for notifications when default launcher changes
...
Bug: 129532605
Test: None
Change-Id: Ie85dfc704939db217c9b59724e0a586020aaa797
2019-05-30 12:00:39 -07:00
Jean-Michel Trivi
3222703156
Merge "AudioService: remove dead BT code" into qt-dev
...
am: 3de2438d5c
Change-Id: I99388c3ec13278731b2e403aa308c2eb8131da21
2019-05-30 11:59:24 -07:00
Robert Carr
6e373387c8
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI am: fbc22c2b6d -s ours
...
am: cd43a5f7ad
Change-Id: Ifb40223f91ab0eb58d97c2e52d60fb3e6d52fd4c
2019-05-30 11:57:51 -07:00
Leon Scroggins
0a9b7b4fca
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
...
am: 9be1d08acb
Change-Id: I01582c19eee9b0aedde169b632384ed60c680f09
2019-05-30 11:55:02 -07:00
Josh Tsuji
4aed7e0cb1
Merge changes I1360deb0,Id9a9eb85,I7f05f2ee,Ie48da88d into qt-dev
...
am: 06cbf65704
Change-Id: I5bbfb0ec91ab5ae8760a8208b9d3a967103df999
2019-05-30 11:53:30 -07:00
TreeHugger Robot
58cfefe9cc
Merge "Fix a11y readout of notification guts buttons" into qt-dev
2019-05-30 18:53:13 +00:00
TreeHugger Robot
3de2438d5c
Merge "AudioService: remove dead BT code" into qt-dev
2019-05-30 18:36:34 +00:00
Robert Carr
cd43a5f7ad
[automerger skipped] DO NOT MERGE SurfaceControl: Fix captureLayers JNI
...
am: fbc22c2b6d -s ours
am skip reason: subject contains skip directive
Change-Id: Iedd5183586ec5b13c71ae943c3ff877e5c98311e
2019-05-30 11:35:37 -07:00
Leon Scroggins
9be1d08acb
Merge "Allow non-convex paths in Outline#setConvexPath" into qt-dev
2019-05-30 18:31:40 +00:00
Josh Tsuji
06cbf65704
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.
2019-05-30 18:23:26 +00:00
Hongyi Zhang
98eed7dcca
Merge "Add Usage info for LocationManager's APIs" into qt-dev
...
am: 11ddc8ea0b
Change-Id: Iab67a0f992436b3a4e9c04d05f19d7ca3d69553a
2019-05-30 11:21:05 -07:00
Jeff Sharkey
c0bb5985af
Shift call statistics back to the original caller.
...
Most of the time MediaProvider is making Binder calls on behalf of
an external caller, so use PropagateWorkSourceTransactListener to
ensure that we record the original source.
Bug: 125725916
Test: atest --test-mapping packages/apps/MediaProvider
Change-Id: I591dfb2903a54239639452954ea2d780e79b280c
2019-05-30 12:18:34 -06:00
Winson Chung
34d893c490
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
...
am: 6f24b88c71
Change-Id: I435bfe2210375deb4cbe07ec39149f9c0e7f0076
2019-05-30 11:16:10 -07:00
Hongyi Zhang
11ddc8ea0b
Merge "Add Usage info for LocationManager's APIs" into qt-dev
2019-05-30 17:53:26 +00:00
Winson Chung
6f24b88c71
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
2019-05-30 17:51:29 +00:00
lumark
5846614ff1
Merge "Skip IME initialization when received the token that already registered" into qt-dev
...
am: 9bb2607703
Change-Id: I9746ca99bc03a83beb6549605394b6760d48b835
2019-05-30 10:44:20 -07:00
Winson Chung
9ffb2d08f1
Merge "Exclude the status bar and HUN from gestures" into qt-dev
...
am: c1da971644
Change-Id: Ia67d56950755830020f06fdce2ab2e68a4225846
2019-05-30 10:42:27 -07:00
TreeHugger Robot
9bb2607703
Merge "Skip IME initialization when received the token that already registered" into qt-dev
2019-05-30 17:33:17 +00:00
Winson Chung
c1da971644
Merge "Exclude the status bar and HUN from gestures" into qt-dev
2019-05-30 17:30:11 +00:00
Patrick Baumann
34ff7e76bb
Merge "Handles pre-process failure without crashing system" into qt-dev
...
am: b8735359aa
Change-Id: I8b6724a77658bf1cca8b50e4d4c3cfad639d8361
2019-05-30 10:13:52 -07:00
TreeHugger Robot
b8735359aa
Merge "Handles pre-process failure without crashing system" into qt-dev
2019-05-30 17:02:17 +00:00
Neil Fuller
9c50fd8c05
[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am: a326166eba
...
am: 364ed0b152 -s ours
am skip reason: change_id I2cb09da5ec5296799e03bab812b7fb29452a623e with SHA1 c3dfd08914 is in history
Change-Id: Ide371473356f522523e49cb7997449eb7f10222d
2019-05-30 10:00:03 -07:00
Steve Elliott
89c2b004bd
Merge "Constrain global actions panel to available space" into qt-dev
...
am: e4de9d2c56
Change-Id: I4bdacc5fd40754ab9391681efb81beec18411f4f
2019-05-30 09:55:49 -07:00
Neil Fuller
364ed0b152
Merge "Switch to HexEncoding from ByteStringUtils"
...
am: a326166eba
Change-Id: Iba8a6d1c19b4daf24905c71f72fdcb280b942ea3
2019-05-30 09:50:53 -07:00
Priyank Singh
682c10b4bf
Merge "Make the Handle bar grabbable." into qt-dev
...
am: 08703d61b1
Change-Id: I2fe9b8858688e751bcd8042d3d9894595ef1a482
2019-05-30 09:44:51 -07:00