tmfang
318cd03ecc
Merge "Catch another exception when we are building slices data for search" into qt-dev
...
am: 7d3a67b04d
2019-05-09 11:11:58 -07:00
TreeHugger Robot
7d3a67b04d
Merge "Catch another exception when we are building slices data for search" into qt-dev
2019-05-09 17:45:10 +00:00
Annie Meng
f26dd740c8
Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev
...
am: b1f4bb60f3
2019-05-09 02:30:32 -07:00
Annie Meng
b1f4bb60f3
Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev
2019-05-09 09:20:03 +00:00
tmfang
6410821f04
Catch another exception when we are building slices data for search
...
We lose chance to build all Settings slices if we got an exception
when settings was creating slice data for controllers.
We should make sure the process goes well even we got an exception
on an incorrect controller.
Also, we log exceptions for each catch.
Bug: 131449561
Test: Open Settings search and then we can see slice for some
search result.
Change-Id: Iac9f0e0a187f6d10cf53886afeb9cab479b6ce02
2019-05-09 10:31:53 +08:00
tmfang
1cb1a64101
Merge "Fix WebViewAppPickerTest" into qt-dev
...
am: 28006039c5
2019-05-08 19:28:07 -07:00
Arc Wang
1255562884
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
...
am: 5c461a2859
2019-05-08 19:27:21 -07:00
Arc Wang
ce9fd5688f
Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev
...
am: fa85f564ac
2019-05-08 19:25:55 -07:00
Andrew Sapperstein
4e49b0cd6e
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
...
am: cf964643b5
2019-05-08 19:19:44 -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
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
f8725ca4af
[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
2019-05-08 17:40:14 -07:00
Kevin Chyn
63658b126f
Merge changes from topic "Face Intro Changes" into qt-dev
...
am: 0f65b773be
2019-05-08 17:21:24 -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
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
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
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
2019-05-08 15:43:07 -07:00
Beth Thibodeau
6b909a7897
Merge "Increase char limit as requested by i18n team" into qt-dev
...
am: 32e0172136
2019-05-08 14:32:04 -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
Salvador Martinez
5519f86320
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
...
am: cbd925bf73
2019-05-08 14:25:28 -07:00
Lei Yu
34fc13602a
Merge "Increate max height of sliceView" into qt-dev
...
am: 04d19a489e
2019-05-08 14:17:56 -07:00
Alex Salo
92e24b055d
Merge "Re-enable the test" into qt-dev
...
am: 95c26b67f1
2019-05-08 14:17:08 -07:00
Fan Zhang
aeabbefe30
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
...
am: c084301c02
2019-05-08 14:16:24 -07:00
Jonathan Scott
140898b28b
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
...
am: 1fd7dfb12e
2019-05-08 14:14:32 -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
Lei Yu
04d19a489e
Merge "Increate max height of sliceView" into qt-dev
2019-05-08 21:02:22 +00: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
Jonathan Scott
5e44c47109
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am: db98a8edec -s ours
...
am: 019e435e87
2019-05-08 13:46:23 -07:00
Lei Yu
bc5dab64cd
Merge "Add null check when restart batteryinfo loader" into qt-dev
...
am: 285fc7f7c3
2019-05-08 13:44:48 -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
Lei Yu
285fc7f7c3
Merge "Add null check when restart batteryinfo loader" into qt-dev
2019-05-08 20:18:11 +00:00
Jonathan Scott
019e435e87
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
...
am: db98a8edec
2019-05-08 13:17:58 -07:00
TreeHugger Robot
db98a8edec
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
2019-05-08 20:00:27 +00:00
Lei Yu
5d569f3ca7
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
...
am: 2ace95f386
2019-05-08 12:54:34 -07:00
Salvador Martinez
fb940feebf
Clear preferences when dialog acknowledged and increase order
...
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.
Test: atest BatterySaverScheduleSeekBarControllerTest
Bug: 132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
2019-05-08 12:28:43 -07:00
TreeHugger Robot
2ace95f386
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
2019-05-08 19:20:13 +00:00
joshmccloskey
0458262fb3
Added Face Enroll Education Screen
...
Test: Builds
Bug: 131774352
Fixes: 131857742
Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
2019-05-08 19:15:50 +00:00
Aran Ink
d8cef25267
Merge "Use correct constants for Global Actions Panel settings." into qt-dev
...
am: 7627363d3e
2019-05-08 12:07:29 -07:00
Beth Thibodeau
4765faa9cf
Increase char limit as requested by i18n team
...
Fixes: 132257773
Test: mp settingsg
Change-Id: I4c5c21899bb9fa61f8f8b32cd56dc57288e282bd
2019-05-08 15:05:55 -04:00
