TreeHugger Robot
c6ebdfe982
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev
2019-05-09 23:46:22 +00:00
Fan Zhang
d2eae19d4c
Clean up homepage toolbar after setting transparent navbar.
...
Bug: 132182711
Test: rebuild
Change-Id: I212b665810f6713980eb749d34d26f27b7100160
2019-05-09 15:47:54 -07:00
Beth Thibodeau
0ed440fcbb
Merge "Make preview image not selectable" into qt-dev
...
am: 43c09673ab
2019-05-09 15:34:06 -07:00
Yanting Yang
d4123926dc
Merge "Fix mirrored arrow issue for RTL" into qt-dev
...
am: a096b6d1f1
2019-05-09 15:19:18 -07:00
Pengquan Meng
0ab776f69d
Fixed network name for about/sim_status
...
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.
Bug: 31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
2019-05-09 15:16:20 -07:00
TreeHugger Robot
43c09673ab
Merge "Make preview image not selectable" into qt-dev
2019-05-09 21:22:18 +00:00
Ng Zhi An
44ec4832d5
Update string description in SAW unsupported screen
...
Bug: 132183451
Test: none
Change-Id: I3e2e5e24feaf4918e9c85d18bfa397c4cfc2cb36
2019-05-09 14:12:15 -07:00
lindatseng
33c5d72ffe
Fix NPE when launching MediaOutput Panel
...
Add NP check when to avoid NPE when launching MediaOutput Panel
Fixes: 132366620
Test: Manual
Change-Id: I21a481907a5bca83404e59e08ba11ce5c55199a4
2019-05-09 14:03:15 -07:00
Zhi An Ng
3267345bc2
Merge "Update strings used in SAW unsupported screen" into qt-dev
...
am: ece299f902
2019-05-09 14:02:30 -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
5cf436aa65
Merge "Fix robolectric test error" into qt-dev
...
am: c617fa2e87
2019-05-09 13:28:26 -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
8822d49ab8
Merge "Display profile picker for content capture settings." into qt-dev
...
am: f39ed1f432
2019-05-09 12:20:58 -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
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
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
Jason Chiu
46294872c7
Remove On/Off subtext next to the Wi-Fi toggle
...
Fixes: 132312797
Test: robotest, visual
Change-Id: I2c3b39e8deda211d23be0b2a73426778dbbf53db
2019-05-09 15:19:02 +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
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
