Beth Thibodeau
e653d51828
Merge "Make preview image not selectable" into qt-dev am: 43c09673ab
...
am: 3339763511
2019-05-09 22:51:30 -07:00
Xin Li
69db86bde6
Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours
...
am: 5d382504c6
2019-05-09 22:23:42 -07:00
Xin Li
c2cbd1db62
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours
...
am: e401f808d6
2019-05-09 21:35:15 -07:00
Yanting Yang
93752a3172
Merge "Fix mirrored arrow issue for RTL" into qt-dev am: a096b6d1f1
...
am: d2877f805a
2019-05-09 20:35:48 -07:00
Zhi An Ng
fd906c9bc2
Merge "Update strings used in SAW unsupported screen" into qt-dev am: ece299f902
...
am: 9604713f49
2019-05-09 20:34:58 -07:00
Raff Tsai
6f162ee6f8
Merge "Fix robolectric test error" into qt-dev am: c617fa2e87
...
am: 8eed7ab16b
2019-05-09 18:15:07 -07:00
Beth Thibodeau
3339763511
Merge "Make preview image not selectable" into qt-dev
...
am: 43c09673ab
2019-05-09 18:08:42 -07:00
Android Build Merger (Role)
5d382504c6
Merge "[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours am: f0acd850fb -s ours am skip reason: subject contains skip directive" into qt-dev-plus-aosp
2019-05-10 00:50:02 +00:00
Yanting Yang
d2877f805a
Merge "Fix mirrored arrow issue for RTL" into qt-dev
...
am: a096b6d1f1
2019-05-09 17:38:59 -07:00
Xin Li
e401f808d6
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 361819cf69 -s ours
...
am: f0acd850fb
2019-05-09 17:25:01 -07:00
Xin Li
f0acd850fb
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
am: 361819cf69
2019-05-09 16:08:44 -07:00
Adam He
b78f572c9b
Merge "Display profile picker for content capture settings." into qt-dev am: f39ed1f432
...
am: 88ada1b06d
2019-05-09 14:37:03 -07:00
TreeHugger Robot
43c09673ab
Merge "Make preview image not selectable" into qt-dev
2019-05-09 21:22:18 +00:00
Zhi An Ng
9604713f49
Merge "Update strings used in SAW unsupported screen" into qt-dev
...
am: ece299f902
2019-05-09 14:04:47 -07:00
tmfang
d31239437f
Merge "Catch another exception when we are building slices data for search" into qt-dev am: 7d3a67b04d
...
am: 1ba833e74e
2019-05-09 13:39:14 -07:00
TreeHugger Robot
a096b6d1f1
Merge "Fix mirrored arrow issue for RTL" into qt-dev
2019-05-09 20:33:26 +00:00
Raff Tsai
8eed7ab16b
Merge "Fix robolectric test error" into qt-dev
...
am: c617fa2e87
2019-05-09 13:30:16 -07:00
Zhi An Ng
ece299f902
Merge "Update strings used in SAW unsupported screen" into qt-dev
2019-05-09 19:29:33 +00:00
Ng Zhi An
6940466b52
Update strings used in SAW unsupported screen
...
Bug: 132183451
Test: adb shell am start-activity -a android.settings.action.MANAGE_OVERLAY_PERMISSION
Change-Id: Ia840b82838bed43234572c4a08bd56b97f391a5b
2019-05-09 19:28:49 +00:00
Adam He
88ada1b06d
Merge "Display profile picker for content capture settings." into qt-dev
...
am: f39ed1f432
2019-05-09 12:18:40 -07:00
Raff Tsai
c617fa2e87
Merge "Fix robolectric test error" into qt-dev
2019-05-09 19:01:20 +00:00
Beth Thibodeau
d5efb5995d
Make preview image not selectable
...
Fixes: 132050099
Test: manual
Change-Id: I102ced947d352901f5bdbf34eeeba98ab0a32cca
2019-05-09 14:38:24 -04:00
TreeHugger Robot
f39ed1f432
Merge "Display profile picker for content capture settings." into qt-dev
2019-05-09 18:27:37 +00:00
tmfang
1ba833e74e
Merge "Catch another exception when we are building slices data for search" into qt-dev
...
am: 7d3a67b04d
2019-05-09 11:05:31 -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
Xin Li
361819cf69
DO NOT MERGE - Merge Pie Bonito/Sargo into master.
...
Bug: 131756210
Change-Id: Ica814624161d8d3cc74a2e5bc9311354767ca255
2019-05-09 09:27:05 -07:00
Annie Meng
5abcf7f1ec
Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev am: b1f4bb60f3
...
am: 04d2a438aa
2019-05-09 02:58:04 -07:00
Annie Meng
04d2a438aa
Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev
...
am: b1f4bb60f3
2019-05-09 02:30:24 -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
Yanting Yang
19261a97ff
Fix mirrored arrow issue for RTL
...
There is no mirrored arrow for RTL in Settings after applying icon
overlays for theming (b/131346125), add autoMirrored attr to fix it.
Fixes: 132174923
Test: visual
Change-Id: I6e70c39c00a5859e49b3a4dce493ea9ccac0417a
2019-05-09 15:52:03 +08:00
Raff Tsai
1b28754b98
Fix robolectric test error
...
Bug: 132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
2019-05-09 11:36:35 +08:00
tmfang
cb183220f2
Merge "Fix WebViewAppPickerTest" into qt-dev am: 28006039c5
...
am: a3345935bd
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
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
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
2019-05-08 20:27:49 -07: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
a3345935bd
Merge "Fix WebViewAppPickerTest" into qt-dev
...
am: 28006039c5
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
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
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
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
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
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
2019-05-08 17:37:42 -07:00
Kevin Chyn
82703baa9d
Merge changes from topic "Face Intro Changes" into qt-dev
...
am: 0f65b773be
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
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
