Automerger Merge Worker
43190bf92b
[automerger skipped] Add whitelist in ResetAppsHelper am: 74ded43527
am: 07f9393486
-s ours
...
am skip reason: Change-Id Ie2f527309f9159babe79636a69ff13fe3ceb64d9 with SHA-1 b54d2f90f2
is in history
Change-Id: I80ec62b13bc64387e3dcbc858631b357730dcccd
2020-02-06 06:14:15 +00:00
Automerger Merge Worker
07f9393486
Add whitelist in ResetAppsHelper am: 74ded43527
...
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
2020-02-06 06:03:18 +00:00
TreeHugger Robot
f63f55afc6
Merge "Rename some resource values for graphics driver preferences dashboard."
2020-02-06 05:17:08 +00:00
Paul Chang
21bc28cae7
Merge "Don't label non-system default handling app with sub text if there is only one profile."
2020-02-06 05:12:36 +00:00
Robert Luo
3e78df55a0
Merge "Merge Tap & Pay settings entries with NFC"
2020-02-06 05:03:39 +00:00
robertluo
81c79bb239
Merge Tap & Pay settings entries with NFC
...
Bug: 142231537
Test: make -j42 RunSettingsRoboTests
Change-Id: I54ea0cdf711f2c381f5bba8575fc22bd6329f3c6
2020-02-06 12:15:39 +08:00
Peiyong Lin
d03dd5ce2a
Rename some resource values for graphics driver preferences dashboard.
...
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I1f63bd40d5de0cd762bf34a75c7eebd9865a13dd
2020-02-05 18:01:59 -08:00
TreeHugger Robot
cf4e12bbd9
Merge "Update profile api"
2020-02-06 01:47:19 +00:00
TreeHugger Robot
3de4dc273c
Merge "Remove oneSelectableTwoDisabledPSimsOneAbsent_twoResults"
2020-02-05 22:18:25 +00:00
Curtis Belmonte
82431abfd9
Merge "Add curtislb@ to settings/biometrics OWNERS file"
2020-02-05 21:38:55 +00:00
Malcolm Chen
dc1dd56b41
Remove oneSelectableTwoDisabledPSimsOneAbsent_twoResults
...
It's not needed as logic of detecting disabled pSIM is moved to
Telephony.
Bug: 147791865
Test: sanity
Change-Id: I158243bcf59e6c39fb55421632e7013ebc80ae80
2020-02-05 20:13:29 +00:00
Jay Aliomer
105624cf14
Merge "Custom restrictions Missing period"
2020-02-05 17:36:39 +00:00
Curtis Belmonte
9262b0aefe
Add curtislb@ to settings/biometrics OWNERS file
...
Test: Presubmit
Change-Id: Ibad058207cd28ac8e10a0ab6c9c57a9d10bc566f
2020-02-05 09:35:37 -08:00
Alex Johnston
1b2670fae4
Merge "Fix LocationForWorkPreferenceControllerTest"
2020-02-05 14:49:00 +00:00
Automerger Merge Worker
bc5e1646d5
[automerger skipped] Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
am: 374153a5cc
am: d4a5fc58c6
-s ours
...
am skip reason: Change-Id I0847d1dea352d0e3b87b1bb95d5c2600a80a7438 with SHA-1 80d9fcbf1b
is in history
Change-Id: I51eb0db82ff5e0f55e9d3f09c79e0f5aaaef42bc
2020-02-05 12:56:07 +00:00
Automerger Merge Worker
d4a5fc58c6
Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
am: 374153a5cc
...
Change-Id: Ibc8da453623946b48b0b0cb8b9ad05295a1ad80c
2020-02-05 12:47:00 +00:00
Automerger Merge Worker
374153a5cc
Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
...
Change-Id: I39ce2533de78c0529c8a705f173303e713b51cb6
2020-02-05 12:37:30 +00:00
Treehugger Robot
5c262a92de
Merge "Add TEST_MAPPING to schedule auto test"
2020-02-05 12:22:33 +00:00
Julia Reynolds
1cba784014
Merge "Support new conversation DND options"
2020-02-05 12:21:25 +00:00
Alex Johnston
f566da5b55
Fix LocationForWorkPreferenceControllerTest
...
* If the location is disabled by admin, then the
preference is disabled and the toggle is no
longer shown. This means that setChecked is no
longer called and the verify statement can be removed.
* If the location is off, the summary should be
'Location is off' rather than 'off'. The verify
statement is now updated with the correct summary.
Bug: 148755845
Test: atest com.android.settings.location.LocationForWorkPreferenceControllerTest
Change-Id: I089be0c4f8e8ec8c10160771055730289d72c8ed
2020-02-05 11:32:03 +00:00
Arc Wang
a595c272fc
Merge "[Wi-Fi] Improve contrast of edit text hint"
2020-02-05 11:16:20 +00:00
Arc Wang
a74473d2f8
[Wi-Fi] Improve contrast of edit text hint
...
Extend the style from TextAppearance.Widget.EditText which
has hint color of #808080 and contrast ratio 3.95
Bug: 146908018
Test: Manual visual
Accessibility scanner shows contrast ratio 3.95
Change-Id: Ie20e750095af30a217166cdffeda2e29cec970e3
2020-02-05 19:15:18 +08:00
Florian Mayer
32b25ec7b0
Merge "Revert "[Settings] Avoid rename inactive subscription from NullPointerException""
2020-02-05 11:11:29 +00:00
Florian Mayer
18b1a84e9c
Revert "[Settings] Avoid rename inactive subscription from NullPointerException"
...
This reverts commit 1b71b5e601
.
Bug: 148924129
Reason for revert: Broke tests
Change-Id: I27da954a105bb28f3f8c5f18961073a59c4d820f
2020-02-05 11:10:29 +00:00
Raff Tsai
55422c7517
Add TEST_MAPPING to schedule auto test
...
Test: atest :postsubmit
Change-Id: Ied8e241ef223ea5e87ca6ee0f04f4128c51ddb87
Merged-In: I0847d1dea352d0e3b87b1bb95d5c2600a80a7438
2020-02-05 10:40:01 +00:00
Menghan Li
0a832ffe10
Merge "Fix Startup fails when click "Color correction" of the selection menu in "Color correction" page"
2020-02-05 09:47:51 +00:00
Minche Li
bdba2a0427
Merge "Remove the entrance of magnification settings"
2020-02-05 09:46:20 +00:00
Menghan Li
497a736e5a
Merge "Change the Settings to app name with settings"
2020-02-05 09:44:02 +00:00
Menghan Li
f37f0103e1
Merge "Dynamic Select-To-Speak and Talkback setFragment style on SUW Welcome Screen."
2020-02-05 09:43:37 +00:00
Paul Chang
ca914a36a7
Don't label non-system default handling app with sub text if there is only one profile.
...
Bug: 148907948
Test: Flash device and check the sub text
Change-Id: I7aa17413bb28adf552ca3551c0a04d34ae69207f
2020-02-05 17:27:49 +08:00
Bonian Chen
8821654a91
Merge "[Settings] Apply ImsQueryProvisioningStat to VoLTE"
2020-02-05 08:49:05 +00:00
hughchen
eba97c8ce6
Update profile api
...
The profile will auto connect / disconnect when set enable / disable
profile. This CL remove connect / disconnect method.
Bug: 141582844
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib875d126be0d8483fb539e7ba950242a4f38cf81
2020-02-05 16:04:36 +08:00
mincheli
02ee1e1715
Remove the entrance of magnification settings
...
The feature will not be landed in R. So remove the settings UI.
Bug: 146473544
Test: make RunSettingsRoboTests
Change-Id: I602d175d616c4ba1bb9f003a1dc349f58268898f
2020-02-05 08:03:30 +00:00
TreeHugger Robot
02be0c65f1
Merge "Listed order on "previously connected" depend on recently connected devices"
2020-02-05 06:20:56 +00:00
Bonian Chen
19b232f73e
[Settings] Apply ImsQueryProvisioningStat to VoLTE
...
1. Code refactor
2. Apply ImsQueryProvisioningStat class to VoLTE's use case
Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: Ie5a56e9b768b9abe88c635e4e5532d72c9ddd1a2
2020-02-05 14:12:23 +08:00
TreeHugger Robot
638b45e4f3
Merge "[Wi-Fi] Apply cache in WifiTracker to update the signal icon immediatelly."
2020-02-05 05:54:17 +00:00
Bonian Chen
9e5c6130cd
Merge "[Settings] Test case failure - RenameMobileNetworkDialogFragmentTest"
2020-02-05 04:57:10 +00:00
Bonian Chen
1768669a4c
[Settings] Test case failure - RenameMobileNetworkDialogFragmentTest
...
Ignore test case to avoid from blocking others
Bug: 148907677
Test: build pass
Change-Id: I99101acfc62f8cd247d1a727936638a0ba18cf70
2020-02-05 12:32:19 +08:00
Automerger Merge Worker
626581e339
[automerger skipped] Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
am: 5437a80536
am: 8ef20ea9c5
-s ours
...
am skip reason: Change-Id I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b with SHA-1 98678221fa
is in history
Change-Id: I542dbaf8c20d98a31419381b86d8ed99fbed13f6
2020-02-05 00:38:43 +00:00
Automerger Merge Worker
2fec4ba1ed
Add Platform VPNs to VPN list am: bcd6b8cbca
am: 846de91c30
am: 00e44f608c
...
Change-Id: Ie11a67984c29b71302239e4491269e50be9be1fb
2020-02-05 00:38:40 +00:00
Automerger Merge Worker
8ef20ea9c5
Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
am: 5437a80536
...
Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
2020-02-05 00:24:12 +00:00
Automerger Merge Worker
00e44f608c
Add Platform VPNs to VPN list am: bcd6b8cbca
am: 846de91c30
...
Change-Id: Ice85a8a0c5b526f67a56e004e3b2d3092076c658
2020-02-05 00:24:10 +00:00
Automerger Merge Worker
5437a80536
Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
...
Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572
2020-02-05 00:07:43 +00:00
Automerger Merge Worker
846de91c30
Add Platform VPNs to VPN list am: bcd6b8cbca
...
Change-Id: Ic6e288d2e4b9634ad7a050361b309fab212e6520
2020-02-05 00:07:40 +00:00
Benedict Wong
e9b3f3303e
Merge changes from topic "platform-vpn-user-consent"
...
* changes:
Update setVpnPackageAuthorization call with VPN type
Add Platform VPNs to VPN list
2020-02-04 23:56:16 +00:00
Yiwen Chen
3099df31d4
Merge "Implement new vibrate for calls in Settings."
2020-02-04 22:55:57 +00:00
Jay Aliomer
3222362404
Custom restrictions Missing period
...
Added a period
Test: visual
Fixes: 139077642
Change-Id: I7bab0b564e022edbac61aece94eb08c248b03135
2020-02-04 17:07:34 -05:00
Benedict Wong
62e55361a8
Update setVpnPackageAuthorization call with VPN type
...
This commit updates the Settings to also pass the additional
VPN type for app-based VPNs.
Bug: 144246835
Test: Compiles, manually tested to be working
Change-Id: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
Merged-In: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
2020-02-04 21:06:07 +00:00
Benedict Wong
15ba2177c4
Merge "Update setVpnPackageAuthorization call with VPN type"
2020-02-04 21:04:01 +00:00
TreeHugger Robot
1bfa4a8245
Merge "Revert "Revert "[Settings] Remove dependency of TelephonyIntents"""
2020-02-04 17:56:39 +00:00