Bonian Chen
d2fe2c9959
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154
...
Change-Id: I4cfc318b3ff3af20cb2edead69db0ef7c31430d9
2020-03-31 16:26:55 +00:00
Bonian Chen
855152fd22
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3
...
Change-Id: If4dec5a4bd6a24d0684aa30711a530d39a59ca63
2020-03-31 16:26:51 +00:00
Bonian Chen
54002ca154
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev
2020-03-31 16:09:27 +00:00
Bonian Chen
311941c7d3
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev
2020-03-31 16:09:27 +00:00
TreeHugger Robot
4be8b73f3e
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
am: 37e6acd9a5
am: b99184d84e
...
Change-Id: I1e845fd38886716c2bbe016546815ab1aad53190
2020-03-31 15:45:50 +00:00
TreeHugger Robot
b99184d84e
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
am: 37e6acd9a5
...
Change-Id: I6410a4d0b06574df8e4688fe085a705d7befb07a
2020-03-31 15:34:45 +00:00
TreeHugger Robot
37e6acd9a5
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
...
Change-Id: I776a3e7e0418231db4e8ef72e3c1899228839941
2020-03-31 15:18:56 +00:00
Beverly
82e7bc46cf
Use DEFAULT_LIST contact intent
...
Test: manual
Fixes: 152733367
Change-Id: Ib2addc353298e593160500347d0a9bbfa85d1e0b
2020-03-31 11:09:50 -04:00
TreeHugger Robot
4b45334288
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev
...
* changes:
[Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
[Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
2020-03-31 15:01:09 +00:00
Kholoud Mohamed
0329f2fcbe
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
am: bf7e468f0c
am: 14d05685a1
...
Change-Id: Ic8267c53e159a2a6b6d10435d12b8dff68ae4d7f
2020-03-31 13:52:23 +00:00
Kholoud Mohamed
14d05685a1
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
am: bf7e468f0c
...
Change-Id: I7e9a11c33a7fecdeaa52ac0a6f5363ddb7971862
2020-03-31 13:38:47 +00:00
Kholoud Mohamed
bf7e468f0c
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
...
Change-Id: I7310a64ae95e0fdaf191b979cacefb8ad645d53a
2020-03-31 13:26:09 +00:00
Kholoud Mohamed
7fb6f35c3a
Merge "Show all apps that requested cross profile permission" into rvc-dev
2020-03-31 13:09:31 +00:00
Alex Kershaw
c364f5d95d
Remove policy transparency for cross-profile calendar setting
...
We will likely deprecate this setting in the next release, to be
replaced by usage of 'connected work and personal apps'. However, we are
keeping it in this release as it's still possible that a lightweight
calendar access API could be useful, if the admin and user approvals are
combined.
For now, the error message that refers to cross-profile calendar when
the setting is disabled is confusing admins, since we're not
recommending usage of this API at this time.
Remove the setting when it is disabled, rather than showing policy
transparency.
Fixes: 143477431
Test: manual
Change-Id: I65573a5ba892e12a4dabcdf23541f33516db0a8a
2020-03-31 11:41:44 +01:00
Arc Wang
a76669656f
[Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
...
After a connect success callback, Wi-Fi picker scrolls to the connected
Wi-Fi network after it's added in.
Bug: 152576795
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
manual
Click a Wi-Fi network or it's context menu 'Connect' button
to connect and see if UI scroll to the top.
Change-Id: Ia96af86c9ed552324089f97db104975e28f6c1c7
2020-03-31 17:24:54 +08:00
Arc Wang
3bb3808043
[Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
...
1. Display the Wi-Fi dialog with MODE_CONNECT.
2. Connect with the WifiConfiguration from
WifiConfigController2#getConfig() if it's available.
Bug: 152826354
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706
2020-03-31 17:01:22 +08:00
govenliu
f9651d92bb
[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test
...
Fix 5 @Ignore unit tests in WifiDetailPreferenceController2Test.
Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I5f64bf455d6a2505f546e2c7a3ba0caddf3f16cc
2020-03-31 16:42:58 +08:00
Robert Luo
b6e34349de
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
am: f2dbeb1542
...
Change-Id: Ie893d9a5c9858c743f18434f093aba1f03d24d33
2020-03-31 08:34:19 +00:00
Robert Luo
f2dbeb1542
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
...
Change-Id: I265d9fdf691f443319417d4cf24b91b0223824d3
2020-03-31 08:19:39 +00:00
Robert Luo
c13ecfad98
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
...
Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2
2020-03-31 08:01:50 +00:00
Robert Luo
c3535eab06
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev
2020-03-31 07:42:24 +00:00
Bonian Chen
a170198f0b
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
am: 155c698d4f
...
Change-Id: I35c153ff8ecf7b9505e87ac4fd9e2ffa7fa7a491
2020-03-31 07:15:23 +00:00
Bonian Chen
155c698d4f
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
...
Change-Id: Ie800cbe35040ed63a8488e7cac8e1bfdfdadb8a4
2020-03-31 07:00:57 +00:00
Bonian Chen
7520adccee
[Settings] Apply WifiCallingQueryImsState
...
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Bonian Chen
949ec8a1f0
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
...
Change-Id: Ib23864723f76e376338604b65171a058cc0df611
2020-03-31 06:39:12 +00:00
Bonian Chen
268bdc12c6
Merge "[Settings] Code Refactor" into rvc-dev
2020-03-31 06:24:15 +00:00
TreeHugger Robot
faff3e2276
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
am: 7fea1bf993
...
Change-Id: I12ec3f1aeddac3cda3ba300057094cf3aa64105b
2020-03-31 05:16:00 +00:00
TreeHugger Robot
7fea1bf993
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
...
Change-Id: Id213c4a4ffdd6bc57fc45e6956660b92d725a75e
2020-03-31 05:04:30 +00:00
TreeHugger Robot
46cc33c9a6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
...
Change-Id: I066c17625736fd8cdaa96068a2bc5accdb5ae3fc
2020-03-31 04:42:59 +00:00
TreeHugger Robot
cd329951ba
Merge "Get MediaDevice from devices list" into rvc-dev
2020-03-31 04:26:31 +00:00
Bonian Chen
21475ae6c6
[Settings] Code Refactor
...
Code refactor in order to support auto testing
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
2020-03-31 03:46:45 +00:00
TreeHugger Robot
545c95317c
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
am: 52162fde91
...
Change-Id: Ic19955a29105435d67c7f586e76ce8d4a1aef858
2020-03-31 03:13:58 +00:00
TreeHugger Robot
52162fde91
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
...
Change-Id: Ief6b6435ad6b344c9fecaa12af0ff83e3e680199
2020-03-31 03:13:39 +00:00
tim peng
774620f543
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
am: 1106c19951
...
Change-Id: Ie11c1cc084213b3196d97ef0eca0f7fa018288a6
2020-03-31 03:13:08 +00:00
TreeHugger Robot
2093f0dee4
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
...
Change-Id: Ia47c8ea68d5b5709e1aa82930ea38ab61f0c7222
2020-03-31 02:51:01 +00:00
tim peng
1106c19951
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
...
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
2020-03-31 02:45:01 +00:00
TreeHugger Robot
477c4fef48
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev
2020-03-31 02:34:51 +00:00
tim peng
4a82a5abb5
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
...
Change-Id: Ic6c44c4ce05197d113f4f0718640f0abb868793e
2020-03-31 02:24:16 +00:00
tim peng
5b0913c2b6
Merge "No media status is visible in Output Switcher" into rvc-dev
2020-03-31 02:04:48 +00:00
Bonian Chen
bef5c99802
[Settings] Remove internal ImsManager access within MobileNetworkUtils
...
Remove the access of com.android.ims.ImsManager from MobileNetworkUtils.
Bug: 140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: Id2550a11c185ac44c1f70c98929c4b1d659f9a0c
2020-03-31 09:41:40 +08:00
TreeHugger Robot
a383b959ac
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours am: 50699d4595
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7a5fd91ca07762f44965e4a2873b92129a8e534a
2020-03-31 00:50:33 +00:00
TreeHugger Robot
50699d4595
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours am: 7f94e44f55
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I660c2a7e46b4c055e417e955a9e9b99aadca3052
2020-03-31 00:25:29 +00:00
TreeHugger Robot
7f94e44f55
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie75baff25f3026bfdb41b067769e7ffef4123eec
2020-03-31 00:04:51 +00:00
TreeHugger Robot
4a08ac176f
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-03-30 23:39:52 +00:00
TreeHugger Robot
931ea77cc3
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
am: 0c0dc0f64e
...
Change-Id: I18cfc1ccb3d631a90f4917fcb7ee976eee7cc0c3
2020-03-30 23:09:53 +00:00
TreeHugger Robot
0c0dc0f64e
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
...
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
2020-03-30 22:51:13 +00:00
TreeHugger Robot
ea63b90c3d
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
...
Change-Id: I76ca506736ed0d8400ed3e063695e96acd8eff5e
2020-03-30 21:32:06 +00:00
TreeHugger Robot
a2d56af9bd
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev
2020-03-30 21:07:15 +00:00
TreeHugger Robot
43919ede30
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf
am: f61da397fd
am: dfdb9d18f8
...
Change-Id: I72d53cad79daaaa17e3e66e576574c20edcf6b57
2020-03-30 20:51:16 +00:00
Julia Reynolds
e7ed0da17a
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3
am: 52b375b242
am: 5c44faa98d
...
Change-Id: I178c73fcd8924adaf0528878f558e6a3509419a1
2020-03-30 20:51:11 +00:00