OSDN Git Service
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
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 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: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
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.
Hongyi Zhang [Thu, 30 May 2019 18:21:05 +0000 (11:21 -0700)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev
am:
11ddc8ea0b
Change-Id: Iab67a0f992436b3a4e9c04d05f19d7ca3d69553a
Winson Chung [Thu, 30 May 2019 18:16:10 +0000 (11:16 -0700)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
am:
6f24b88c71
Change-Id: I435bfe2210375deb4cbe07ec39149f9c0e7f0076
lumark [Thu, 30 May 2019 17:56:27 +0000 (10:56 -0700)]
Merge "Skip IME initialization when received the token that already registered" into qt-dev am:
9bb2607703
am:
9992e08829
Change-Id: I25ffe7f5bb75e7da5c9674add12366c8ddf30149
Android Build Merger (Role) [Thu, 30 May 2019 17:55:22 +0000 (17:55 +0000)]
Merge "Merge "Exclude the status bar and HUN from gestures" into qt-dev am:
c1da971644 am:
4236f9867e" into qt-r1-dev-plus-aosp
Winson Chung [Thu, 30 May 2019 17:54:45 +0000 (10:54 -0700)]
Merge "Exclude the status bar and HUN from gestures" into qt-dev am:
c1da971644
am:
4236f9867e
Change-Id: I2e06d5d9a9d5c3cebf6b70b2a48aea0d0b947fd3
lumark [Thu, 30 May 2019 17:54:41 +0000 (10:54 -0700)]
Merge "Skip IME initialization when received the token that already registered" into qt-dev am:
9bb2607703
am:
5846614ff1
Change-Id: I76c497ddc7caedb2217b3cdddaf53d0fcfa5a9df
Android Build Merger (Role) [Thu, 30 May 2019 17:53:55 +0000 (17:53 +0000)]
Merge "Merge "Exclude the status bar and HUN from gestures" into qt-dev am:
c1da971644 am:
9ffb2d08f1" into qt-r1-dev-plus-aosp
Hongyi Zhang [Thu, 30 May 2019 17:53:26 +0000 (17:53 +0000)]
Merge "Add Usage info for LocationManager's APIs" into qt-dev
Winson Chung [Thu, 30 May 2019 17:53:20 +0000 (10:53 -0700)]
Merge "Exclude the status bar and HUN from gestures" into qt-dev am:
c1da971644
am:
9ffb2d08f1
Change-Id: Ie2e2c242b88725b00d2b0b163c9851326f2023e6
Robert Snoeberger [Thu, 30 May 2019 17:52:26 +0000 (10:52 -0700)]
Merge "Catch IllegalArgumentException caused by recycled bitmap" into qt-r1-dev
am:
1383ff3a22
Change-Id: I99ab05a2042b85535e72c893d7e0c4004d7d5eca
Winson Chung [Thu, 30 May 2019 17:51:29 +0000 (17:51 +0000)]
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
lumark [Thu, 30 May 2019 17:44:20 +0000 (10:44 -0700)]
Merge "Skip IME initialization when received the token that already registered" into qt-dev
am:
9bb2607703
Change-Id: I9746ca99bc03a83beb6549605394b6760d48b835
lumark [Thu, 30 May 2019 17:44:19 +0000 (10:44 -0700)]
Merge "Skip IME initialization when received the token that already registered" into qt-dev
am:
9bb2607703
Change-Id: I47e3521b214d5b5e057c979dfe8d96696bd42009
Winson Chung [Thu, 30 May 2019 17:42:53 +0000 (10:42 -0700)]
Merge "Exclude the status bar and HUN from gestures" into qt-dev
am:
c1da971644
Change-Id: I149a897810fb290ada66c153cc6dc5068e656e34
Winson Chung [Thu, 30 May 2019 17:42:27 +0000 (10:42 -0700)]
Merge "Exclude the status bar and HUN from gestures" into qt-dev
am:
c1da971644
Change-Id: Ia67d56950755830020f06fdce2ab2e68a4225846
TreeHugger Robot [Thu, 30 May 2019 17:39:21 +0000 (17:39 +0000)]
Merge "Catch IllegalArgumentException caused by recycled bitmap" into qt-r1-dev
TreeHugger Robot [Thu, 30 May 2019 17:33:17 +0000 (17:33 +0000)]
Merge "Skip IME initialization when received the token that already registered" into qt-dev
Winson Chung [Thu, 30 May 2019 17:30:11 +0000 (17:30 +0000)]
Merge "Exclude the status bar and HUN from gestures" into qt-dev
Patrick Baumann [Thu, 30 May 2019 17:22:57 +0000 (10:22 -0700)]
Merge "Handles pre-process failure without crashing system" into qt-dev am:
b8735359aa
am:
f803a67b17
Change-Id: I8c550178e943d90b6413f80753462f68c76ac19f
Patrick Baumann [Thu, 30 May 2019 17:20:12 +0000 (10:20 -0700)]
Merge "Handles pre-process failure without crashing system" into qt-dev am:
b8735359aa
am:
34ff7e76bb
Change-Id: Ic0801fe259a2e1325ccc377dd267a9daa1d61649
Patrick Baumann [Thu, 30 May 2019 17:16:52 +0000 (10:16 -0700)]
Merge "Handles pre-process failure without crashing system" into qt-dev
am:
b8735359aa
Change-Id: Ie3216c5918d423c23f0414fe8f9c1c62b1e7d0bb
Patrick Baumann [Thu, 30 May 2019 17:13:52 +0000 (10:13 -0700)]
Merge "Handles pre-process failure without crashing system" into qt-dev
am:
b8735359aa
Change-Id: I8b6724a77658bf1cca8b50e4d4c3cfad639d8361
Neil Fuller [Thu, 30 May 2019 17:12:23 +0000 (10:12 -0700)]
[automerger skipped] Merge "Switch to HexEncoding from ByteStringUtils" am:
a326166eba am:
364ed0b152 -s ours
am:
9c50fd8c05 -s ours
am skip reason: change_id I2cb09da5ec5296799e03bab812b7fb29452a623e with SHA1
c3dfd08914 is in history
Change-Id: I081d7ccdb7150b829f5aa95327671ab42d3d9ce2
Steve Elliott [Thu, 30 May 2019 17:09:55 +0000 (10:09 -0700)]
Merge "Constrain global actions panel to available space" into qt-dev am:
e4de9d2c56
am:
b56c5bc329
Change-Id: Idbac4f400286c165bb56da07d64040bb4dab3c69
Android Build Merger (Role) [Thu, 30 May 2019 17:09:17 +0000 (17:09 +0000)]
Merge "Merge "Constrain global actions panel to available space" into qt-dev am:
e4de9d2c56 am:
89c2b004bd" into qt-r1-dev-plus-aosp
Steve Elliott [Thu, 30 May 2019 17:08:17 +0000 (10:08 -0700)]
Merge "Constrain global actions panel to available space" into qt-dev am:
e4de9d2c56
am:
89c2b004bd
Change-Id: If5ea41db5b3131112824bff66622540bdf713db2
Selim Cinek [Thu, 30 May 2019 17:08:14 +0000 (10:08 -0700)]
Merge "Fixed that we could be stuck with notifications pulse expanding" into qt-r1-dev
am:
aab01138f7
Change-Id: I92888f8358dbec378b511de3f3b91f2c8e62e001
TreeHugger Robot [Thu, 30 May 2019 17:02:17 +0000 (17:02 +0000)]
Merge "Handles pre-process failure without crashing system" into qt-dev
Priyank Singh [Thu, 30 May 2019 17:00:48 +0000 (10:00 -0700)]
Merge "Make the Handle bar grabbable." into qt-dev am:
08703d61b1
am:
a30f04be4e
Change-Id: Ia7dbdf1d6fbcf4d2ada321a5e9a15fc49830b61b
Neil Fuller [Thu, 30 May 2019 17:00:03 +0000 (10:00 -0700)]
[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
Android Build Merger (Role) [Thu, 30 May 2019 16:59:16 +0000 (16:59 +0000)]
Merge "Merge "Make the Handle bar grabbable." into qt-dev am:
08703d61b1 am:
682c10b4bf" into qt-r1-dev-plus-aosp
Priyank Singh [Thu, 30 May 2019 16:58:22 +0000 (09:58 -0700)]
Merge "Make the Handle bar grabbable." into qt-dev am:
08703d61b1
am:
682c10b4bf
Change-Id: If04f086d1b4b564d1e8061fbd615707bf43ff1db
Yi Jiang [Thu, 30 May 2019 16:57:47 +0000 (09:57 -0700)]
Merge "Add user-switching observer to AttentionDetector" into qt-dev am:
5828019131
am:
51fc37556b
Change-Id: I2005bcc47d5c6187a74b252e626cd9b3d7021aff
Steve Elliott [Thu, 30 May 2019 16:55:49 +0000 (09:55 -0700)]
Merge "Constrain global actions panel to available space" into qt-dev
am:
e4de9d2c56
Change-Id: I4bdacc5fd40754ab9391681efb81beec18411f4f
Steve Elliott [Thu, 30 May 2019 16:55:48 +0000 (09:55 -0700)]
Merge "Constrain global actions panel to available space" into qt-dev
am:
e4de9d2c56
Change-Id: Ib6f1b6e14627b53a184d226db7405d431c180b58
Neil Fuller [Thu, 30 May 2019 16:50:53 +0000 (09:50 -0700)]
Merge "Switch to HexEncoding from ByteStringUtils"
am:
a326166eba
Change-Id: Iba8a6d1c19b4daf24905c71f72fdcb280b942ea3
Yi Jiang [Thu, 30 May 2019 16:47:57 +0000 (09:47 -0700)]
Merge "Merge "Add user-switching observer to AttentionDetector" into qt-dev am:
5828019131" into qt-dev-plus-aosp
am:
bd51fabf51
Change-Id: Ieacff918d2d01240e06aa49dcc70c3f560ddf5ee
Selim Cinek [Thu, 30 May 2019 16:47:34 +0000 (16:47 +0000)]
Merge "Fixed that we could be stuck with notifications pulse expanding" into qt-r1-dev
OSDN Git Service
