tmfang
|
cb183220f2
|
Merge "Fix WebViewAppPickerTest" into qt-dev am: 28006039c5
am: a3345935bd
Change-Id: I68e0fc083ea7557a953f14f560b21caca0873261
|
2019-05-08 20:33:40 -07:00 |
|
Arc Wang
|
2723563a19
|
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev am: 5c461a2859
am: 6830a691dd
Change-Id: I3c74212e9efa6227f5c591080f3b593fb7e42b5a
|
2019-05-08 20:32:32 -07:00 |
|
Arc Wang
|
d835b44407
|
Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev am: fa85f564ac
am: 9fe1e3233c
Change-Id: I7ae4d18684b3331dc3cc32930387cb32196a7f8d
|
2019-05-08 20:30:16 -07:00 |
|
Andrew Sapperstein
|
acd3a9f96d
|
Merge "Update summary for mobile data toggle for CBRS." into qt-dev am: cf964643b5
am: f8058733c2
Change-Id: Id779383a7216a53cc41c96eea76265c0a6b06105
|
2019-05-08 20:27:49 -07:00 |
|
tmfang
|
a3345935bd
|
Merge "Fix WebViewAppPickerTest" into qt-dev
am: 28006039c5
Change-Id: Ie0baea1d62d5d3c04b5af48a73c2ff5f3a9a40a8
|
2019-05-08 19:16:45 -07:00 |
|
Arc Wang
|
6830a691dd
|
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
am: 5c461a2859
Change-Id: If6b45a274e22f0bc8c60b2276a0db39778bd2b34
|
2019-05-08 19:11:24 -07:00 |
|
Arc Wang
|
9fe1e3233c
|
Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev
am: fa85f564ac
Change-Id: I6ce4c1c5bc84513197fde0f51cf35f2e5a2c6343
|
2019-05-08 19:10:04 -07:00 |
|
Andrew Sapperstein
|
f8058733c2
|
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
am: cf964643b5
Change-Id: I01bb48fc8bf405d6d807630e01e1f03a14432f9f
|
2019-05-08 19:01:36 -07:00 |
|
TreeHugger Robot
|
28006039c5
|
Merge "Fix WebViewAppPickerTest" into qt-dev
|
2019-05-09 02:00:26 +00:00 |
|
Arc Wang
|
5c461a2859
|
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
|
2019-05-09 01:29:48 +00:00 |
|
Arc Wang
|
fa85f564ac
|
Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev
|
2019-05-09 01:29:25 +00:00 |
|
Jonathan Scott
|
89ccd188e0
|
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours am: 550496d236 -s ours am: 416b49569a
am: 8402c8c44c -s ours
am skip reason: subject contains skip directive
Change-Id: I27a7c3f01ae5ed2b5c1ef05b14b295a647bab7a2
|
2019-05-08 18:23:08 -07:00 |
|
Kevin Chyn
|
4908680470
|
Merge changes from topic "Face Intro Changes" into qt-dev am: 0f65b773be
am: 82703baa9d
Change-Id: I3b2c9327aeadae1dba660e0bc9ed8d7470c2a50b
|
2019-05-08 18:17:00 -07:00 |
|
TreeHugger Robot
|
cf964643b5
|
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
|
2019-05-09 00:51:31 +00:00 |
|
Jonathan Scott
|
8402c8c44c
|
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours am: 550496d236 -s ours
am: 416b49569a
Change-Id: Iddbb3f020c2ffd3693e8c739c6b244ab9da0fdf9
|
2019-05-08 17:37:42 -07:00 |
|
Kevin Chyn
|
82703baa9d
|
Merge changes from topic "Face Intro Changes" into qt-dev
am: 0f65b773be
Change-Id: I3868316218a7c6cd22e495f8a497941ab7451fc1
|
2019-05-08 17:08:01 -07:00 |
|
Jonathan Scott
|
416b49569a
|
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2 am: 306ff7e3a9 -s ours
am: 550496d236 -s ours
am skip reason: subject contains skip directive
Change-Id: I2571156e2d9a07fdae9e5685dd3edc6c6fb18849
|
2019-05-08 16:56:02 -07:00 |
|
Kevin Chyn
|
0f65b773be
|
Merge changes from topic "Face Intro Changes" into qt-dev
* changes:
Added Face Enroll Education Screen
Updated Face Enroll Introduction
|
2019-05-08 23:55:22 +00:00 |
|
Jonathan Scott
|
550496d236
|
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2
am: 306ff7e3a9 -s ours
am skip reason: subject contains skip directive
Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99
|
2019-05-08 16:25:48 -07:00 |
|
Jonathan Scott
|
306ff7e3a9
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8
am: 9f280a15a2
Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
|
2019-05-08 16:09:26 -07:00 |
|
Andrew Sapperstein
|
477e345f21
|
Update summary for mobile data toggle for CBRS.
Fixes: 127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
|
2019-05-08 15:55:04 -07:00 |
|
Jonathan Scott
|
9f280a15a2
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
am: bd3672b2d8
Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f
|
2019-05-08 15:43:07 -07:00 |
|
Beth Thibodeau
|
dc3524d610
|
Merge "Increase char limit as requested by i18n team" into qt-dev am: 32e0172136
am: 93ff7921d3
Change-Id: Iffdec5ab71f3326829454dcd122b964dbdce2d9b
|
2019-05-08 15:17:02 -07:00 |
|
Salvador Martinez
|
83fc48a63a
|
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev am: cbd925bf73
am: 63fb185d64
Change-Id: Idd12b811d0dfd5805a626c97c8c422c3cd7b4e4a
|
2019-05-08 15:14:40 -07:00 |
|
Lei Yu
|
8aef222a55
|
Merge "Increate max height of sliceView" into qt-dev am: 04d19a489e
am: 91af617ade
Change-Id: Ibdd20296e1c26453b117a10b233579b27a3dad21
|
2019-05-08 15:07:10 -07:00 |
|
Alex Salo
|
925c6c0e68
|
Merge "Re-enable the test" into qt-dev am: 95c26b67f1
am: ee9f413a0f
Change-Id: Iad9f54f7ec685e116bd9e835296ebb0d9eb38ef4
|
2019-05-08 14:48:07 -07:00 |
|
Fan Zhang
|
5f91d8da42
|
Merge "Display settings homepage content fully edge-to-edge" into qt-dev am: c084301c02
am: 7f58e8cd1b
Change-Id: I5425c23716ad8118a6313433545c783f55bf7db4
|
2019-05-08 14:47:07 -07:00 |
|
Beth Thibodeau
|
93ff7921d3
|
Merge "Increase char limit as requested by i18n team" into qt-dev
am: 32e0172136
Change-Id: Iaefc001f39eaeddd1bbd698e7e36574bd03fc953
|
2019-05-08 14:37:23 -07:00 |
|
Jonathan Scott
|
3935966a7e
|
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am: 1fd7dfb12e
am: 9017dc6c0a -s ours
am skip reason: subject contains skip directive
Change-Id: I37b613d8e2381d6909be8df04c26cb948f7b4a06
|
2019-05-08 14:30:52 -07:00 |
|
Salvador Martinez
|
63fb185d64
|
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
am: cbd925bf73
Change-Id: Ide094fdbacadb8ea40f2e3b0bad32a8d9644ebe5
|
2019-05-08 14:28:12 -07:00 |
|
Jonathan Scott
|
b16b6dbd61
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am: 019e435e87
am: c1c2a98c51 -s ours
am skip reason: subject contains skip directive
Change-Id: I36eeec49f4e864e5259960fa0672fff9c5d5a47a
|
2019-05-08 14:27:39 -07:00 |
|
TreeHugger Robot
|
32e0172136
|
Merge "Increase char limit as requested by i18n team" into qt-dev
|
2019-05-08 21:26:14 +00:00 |
|
Lei Yu
|
91af617ade
|
Merge "Increate max height of sliceView" into qt-dev
am: 04d19a489e
Change-Id: I2f9ac5c0fb5190fb2a14c5f2be618f6392c011fa
|
2019-05-08 14:25:18 -07:00 |
|
Lei Yu
|
b9974fddc4
|
Merge "Add null check when restart batteryinfo loader" into qt-dev am: 285fc7f7c3
am: ddf3268ad1
Change-Id: I01c46e99d6c320350a2cbffa6d9017cacfe0bd02
|
2019-05-08 14:24:40 -07:00 |
|
TreeHugger Robot
|
cbd925bf73
|
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
|
2019-05-08 21:12:52 +00:00 |
|
Alex Salo
|
ee9f413a0f
|
Merge "Re-enable the test" into qt-dev
am: 95c26b67f1
Change-Id: If57f2b5b8170d3f6ae303d8572244c97c6c94727
|
2019-05-08 14:07:58 -07:00 |
|
Fan Zhang
|
7f58e8cd1b
|
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
am: c084301c02
Change-Id: Iaf752753accb6324bcdc595fcd58042ca83ef7fd
|
2019-05-08 14:07:00 -07:00 |
|
Lei Yu
|
04d19a489e
|
Merge "Increate max height of sliceView" into qt-dev
|
2019-05-08 21:02:22 +00:00 |
|
Jonathan Scott
|
9017dc6c0a
|
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
am: 1fd7dfb12e
Change-Id: I03df9a96487204ca7b6bf1f3c15fbfe2b2397cad
|
2019-05-08 14:00:15 -07:00 |
|
Jonathan Scott
|
c1c2a98c51
|
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
am: 019e435e87
Change-Id: I16f218f0aa5cf6c1ce17bc5543f25b44ca73a00e
|
2019-05-08 13:57:25 -07:00 |
|
Android Build Merger (Role)
|
bd3672b2d8
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
|
2019-05-08 20:51:48 +00:00 |
|
Android Build Merger (Role)
|
333afb4357
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
|
2019-05-08 20:51:45 +00:00 |
|
Android Build Merger (Role)
|
003ce809c6
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
|
2019-05-08 20:51:43 +00:00 |
|
Android Build Merger (Role)
|
7d86790c7b
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
|
2019-05-08 20:51:40 +00:00 |
|
Android Build Merger (Role)
|
133337b4dc
|
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
|
2019-05-08 20:51:37 +00:00 |
|
Jonathan Scott
|
b985aa2f29
|
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
|
2019-05-08 20:51:35 +00:00 |
|
Lei Yu
|
ddf3268ad1
|
Merge "Add null check when restart batteryinfo loader" into qt-dev
am: 285fc7f7c3
Change-Id: I75c8925d1b4b0707eb58de2e46f94c539e091e56
|
2019-05-08 13:50:37 -07:00 |
|
TreeHugger Robot
|
95c26b67f1
|
Merge "Re-enable the test" into qt-dev
|
2019-05-08 20:29:38 +00:00 |
|
Fan Zhang
|
c084301c02
|
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
|
2019-05-08 20:26:31 +00:00 |
|
Android Build Merger (Role)
|
1fd7dfb12e
|
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours am skip reason: subject contains skip directive" into qt-dev
|
2019-05-08 20:20:20 +00:00 |
|