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
4bcd19b296
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
am: 37e6acd9a5
...
Change-Id: I4b3fa69ed60dbbd4fe936d463673ef8767fd982c
2020-03-31 15:34:52 +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
TreeHugger Robot
0d76063cc5
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
...
Change-Id: I8562f5b6a89c16ca623fe4bbb6c6f5a9aa29ded8
2020-03-31 15:18:34 +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
3e5e6920eb
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
am: bf7e468f0c
...
Change-Id: I1fcaa7e6bd6616a5df7187c36575bc6f9abdf1f7
2020-03-31 13:52:36 +00:00
Kholoud Mohamed
c2b8fd2e85
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a
...
Change-Id: Icdfbcdc0c64a6784a0593f34cb9e141bbbc259e7
2020-03-31 13:27:00 +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
Robert Luo
9fc4bfdcb5
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
am: c13ecfad98
...
Change-Id: I82be8b4c9c8a2929aac7570c198a2fed2c0eafc1
2020-03-31 08:19:18 +00:00
Robert Luo
f62beedb4f
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06
...
Change-Id: I556aee40bc3bda47351788aa63ad63bfc43a6f6b
2020-03-31 08:02:19 +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
9e9597f7d8
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 949ec8a1f0
...
Change-Id: I3fbf2b0e9a69d08c5926ce05d2bef76d36e6f84f
2020-03-31 07:00:18 +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
9dda57cd21
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
...
Change-Id: I86c84f03fedfbaae24f377552c5998fc9b31cce4
2020-03-31 06:39:41 +00: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
210c260ce6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
am: 46cc33c9a6
...
Change-Id: Ied6e18f0806b1f32fb3adcec483adc34eb7a23aa
2020-03-31 05:04:21 +00:00
TreeHugger Robot
820d35b59a
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba
...
Change-Id: I1cd9eb45833c4a572a98b8b8996bc8512f92c069
2020-03-31 04:43:08 +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
1e2a313c5a
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
am: 2093f0dee4
...
Change-Id: I9d0663c100944dcced8ae20d0d38c6ba3364182d
2020-03-31 03:13:38 +00:00
TreeHugger Robot
58920061b1
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48
...
Change-Id: I7658df2b27aa43f948739d06bf7cf18b94b5391d
2020-03-31 02:51:20 +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
2b47660696
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
am: 4a82a5abb5
...
Change-Id: I3976f109e633f10b6b91b8f756588be561bcb187
2020-03-31 02:44:50 +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
5c81b237cd
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6
...
Change-Id: I77aeae7c8b4f3f6acafec0e6a05d6b1310f6cc50
2020-03-31 02:24:35 +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
d87a2cb1f3
[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: I71ff8fa319bb3b19f8c5828412159fc505262aed
2020-03-31 00:25:16 +00:00
TreeHugger Robot
7c4f2d2cc8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie27ed918d7405a42d2e49c3122f37f2c4862b554
2020-03-31 00:05:16 +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
4b997ee9fd
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
am: ea63b90c3d
...
Change-Id: Icbbe2f70adac63bf922dd66edb31760ae3efb851
2020-03-30 21:49:07 +00:00
TreeHugger Robot
ee96c179b4
Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd
...
Change-Id: I98aec73f1f08197b5bbb2a600e088fac9bf74cd7
2020-03-30 21:48:38 +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
8b94c0e4a3
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf
am: f61da397fd
...
Change-Id: Ia96c24f21d404c3d043047aa68bc465f779a1114
2020-03-30 20:39:04 +00:00
Julia Reynolds
fdf32b618c
Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3
am: 52b375b242
...
Change-Id: I0792a5c776aeec22f6f3622cbe8c744831e13853
2020-03-30 20:38:59 +00:00
Julia Reynolds
639b6f89ea
Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528
am: 6d30804cec
...
Change-Id: I2ea539acf7f6427021016d7fe6d102e869cce456
2020-03-30 20:38:54 +00:00
TreeHugger Robot
21cd235d70
Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf
...
Change-Id: Ia6d782d4c071a9593ea44d31de115a4fbc566953
2020-03-30 20:18:40 +00:00