Commit Graph

53499 Commits

Author SHA1 Message Date
Kevin Chang
bb6395eb4a Improve the Accessibility warning dialog with new design
Create new Accessibility warning dialog based on the style of permission
dialog

Bug: 129788631
Test: Visual
Change-Id: I0ec693f9c29e6e85e17d5bd1a64a4c0fe9499f95
2019-05-10 11:46:19 +08:00
Bill Yi
90b05ce806 Import translations. DO NOT MERGE
Change-Id: Iccb7422cb3ef9f1241f341820008bcaae1075779
Auto-generated-cl: translation import
2019-05-09 20:42:37 -07:00
Yanting Yang
93752a3172 Merge "Fix mirrored arrow issue for RTL" into qt-dev am: a096b6d1f1
am: d2877f805a

Change-Id: Ida7f3c188dce06c5516ed216f5df4d8ed335ea4b
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

Change-Id: Ic2ba3d2e49eedf6e21515a050fc88b007ede92df
2019-05-09 20:34:58 -07:00
hughchen
095c5be448 Clear media switcher items when in phone call
- update test case

Bug: 132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: I2bbd35e869e8ab5596d280d04fddc98f05629190
2019-05-10 10:27:26 +08:00
Xin Li
601dd7f647 [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: d5ce2c2afc -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4eb5c4bbd9a841279826081f8d714d8c24cbf5b
2019-05-09 19:05:15 -07:00
Raff Tsai
6f162ee6f8 Merge "Fix robolectric test error" into qt-dev am: c617fa2e87
am: 8eed7ab16b

Change-Id: I85f13ff20bb7089b5b0e6021e8b6712e74e35480
2019-05-09 18:15:07 -07:00
Beth Thibodeau
3339763511 Merge "Make preview image not selectable" into qt-dev
am: 43c09673ab

Change-Id: I0764fd89d50361b152f73fe0e9374cffaf35865a
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

Change-Id: Ib6fe4d4302274d4c99094b424ce580ee14c6271c
2019-05-09 17:38:59 -07:00
TreeHugger Robot
30a9392b21 Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev 2019-05-10 00:27:34 +00:00
Xin Li
e401f808d6 [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

Change-Id: I6f942defbfadc4843ec881dd08feaf61db69d3d6
2019-05-09 17:25:01 -07:00
TreeHugger Robot
b0f641869b Merge "Fix NPE when launching MediaOutput Panel" into qt-dev 2019-05-09 23:58:16 +00:00
TreeHugger Robot
c6ebdfe982 Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev 2019-05-09 23:46:22 +00:00
Xin Li
f0acd850fb [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 361819cf69 -s ours
am skip reason: subject contains skip directive

Change-Id: I16b6508bd9ad9c92feee71ebc34cbf65edb866d8
2019-05-09 16:08:44 -07: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
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
Xin Li
d5ce2c2afc Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." 2019-05-09 22:05:45 +00:00
Adam He
b78f572c9b Merge "Display profile picker for content capture settings." into qt-dev am: f39ed1f432
am: 88ada1b06d

Change-Id: Icc6ac834bc00b4c9db8293eda6f3876febb7e481
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
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
Zhi An Ng
9604713f49 Merge "Update strings used in SAW unsupported screen" into qt-dev
am: ece299f902

Change-Id: Ib225bf12b6bbfdbe1c23d76a776df548082d0491
2019-05-09 14:04:47 -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
tmfang
d31239437f Merge "Catch another exception when we are building slices data for search" into qt-dev am: 7d3a67b04d
am: 1ba833e74e

Change-Id: Iaf2daf83c41f180e42ff7cf49cb759a8bba23d95
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

Change-Id: I34539bf27f4dd4cf56e35f9e039529f68104d060
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

Change-Id: I1103f4ba46db43209ae86f812d27505ce394eae3
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

Change-Id: I1dec0dd96ff9611677313ba3416f3ca3766eb61e
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

Change-Id: I362dbee780929bc8b975b3689f1dff1138fba9f0
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

Change-Id: I0889307d8485b7768cedfcda18c41faa647b6b2e
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
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
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
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

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