Bonian Chen
fa83a139ca
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959
...
Change-Id: I56e3d5cf3731b4188afbad5d88b8931b98fa21bf
2020-03-31 16:38:36 +00:00
Bonian Chen
f5b033015a
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22
...
Change-Id: Ica2bc8b657f244a6341e67dd28db5c213bf33be0
2020-03-31 16:38:33 +00:00
Bonian Chen
ddb2495761
Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154
...
Change-Id: I4eee2d80449cb4680fd8f4003093658140e32ac4
2020-03-31 16:27:10 +00:00
Bonian Chen
17cd51e9eb
Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3
...
Change-Id: I798948b3ffe73b9830c12eb473e40beee0ceef57
2020-03-31 16:27:08 +00:00
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
9ca35fc324
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: b99184d84e am: 4be8b73f3e am: 98b4ce9184
...
Change-Id: I29e8a368c319e6a6de29a4e4d511d12a9ab43c3c
2020-03-31 16:00:54 +00:00
TreeHugger Robot
98b4ce9184
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: b99184d84e am: 4be8b73f3e
...
Change-Id: I6c96c53d6c3cbccb085e37cc6a4a79b7cd305e66
2020-03-31 16:00:38 +00:00
TreeHugger Robot
2391d48238
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296 am: a7e1794024
...
Change-Id: Ie27c34c685a035f0751488e95e35ee9cebf980ea
2020-03-31 16:00:34 +00:00
TreeHugger Robot
a7e1794024
Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296
...
Change-Id: I8fed8c5f348136496ef868db294c4af04a5112d3
2020-03-31 15:46:07 +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
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
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
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
Automerger Merge Worker
0e66dbd60e
Merge "Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 am: 0329f2fcbe" into rvc-qpr-dev-plus-aosp am: c77942943f
...
Change-Id: Ia43a4ec08d8a2ad350bedfc7849525b3b8dd0f30
2020-03-31 14:26:42 +00:00
Kholoud Mohamed
f638279fae
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb am: 1910a64cf1
...
Change-Id: I2b6b7f55b4e3870f54c9f41b360d460c628d638c
2020-03-31 14:26:22 +00:00
Automerger Merge Worker
c77942943f
Merge "Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 am: 0329f2fcbe" into rvc-qpr-dev-plus-aosp
2020-03-31 14:09:10 +00:00
Kholoud Mohamed
3927250190
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 14d05685a1 am: 0329f2fcbe
...
Change-Id: I639cdcd0cc5ca1ea977369684fe986d0887a1602
2020-03-31 14:09:05 +00:00
Kholoud Mohamed
1910a64cf1
Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb
...
Change-Id: Ide25e69dc66a8c8263a4a6a1e949933941085b44
2020-03-31 14:08:59 +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
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
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
Robert Luo
52a871a8be
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: f2dbeb1542 am: b6e34349de am: ef548f8629
...
Change-Id: I299bd3a9ec333337ce8f75ee72bbeee3a8ea2f91
2020-03-31 10:51:46 +00:00
Bonian Chen
6e16e79d1a
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f am: a170198f0b am: f35562af9a
...
Change-Id: Ie81997761498a98a326c17d66216836722d38eed
2020-03-31 10:51:03 +00:00
TreeHugger Robot
f55f8eb5d6
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 7fea1bf993 am: faff3e2276 am: 5ef48cf252
...
Change-Id: If5a03452b7560473c1b988fe6a17adf33c18263c
2020-03-31 10:49:52 +00:00
TreeHugger Robot
88d4e48ffc
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 52162fde91 am: 545c95317c am: 3087ed5a7f
...
Change-Id: I60eb72d635427ed3e4ca254b0e350bdca5cd97c7
2020-03-31 10:41:51 +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
Robert Luo
ef548f8629
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: f2dbeb1542 am: b6e34349de
...
Change-Id: I1f2c9eeb61e509a27a52907f399b88a41f75cdea
2020-03-31 10:00:49 +00:00
Bonian Chen
f35562af9a
Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f am: a170198f0b
...
Change-Id: Ifdb5aa5bb04191ce3d00b3d9f885ef6fd2664971
2020-03-31 09:59:51 +00:00
TreeHugger Robot
5ef48cf252
Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 7fea1bf993 am: faff3e2276
...
Change-Id: Ia5e0c4df1c191dc7c5018b6e34be63471e66e999
2020-03-31 09:58:17 +00:00
TreeHugger Robot
3087ed5a7f
Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 52162fde91 am: 545c95317c
...
Change-Id: Ib17d078be14398df69d55a430602434a4c6b8877
2020-03-31 09:54:13 +00:00
tim peng
a092482d18
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951 am: 774620f543 am: 0c9505da84
...
Change-Id: I0d25df9506765123ac65c631665573c36819f01f
2020-03-31 09:45:32 +00:00
tim peng
0c9505da84
Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951 am: 774620f543
...
Change-Id: Iaf2f09df206b561dc4478d8f730e27b9944236e7
2020-03-31 09:27:37 +00: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
ca0bfd0f36
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: 9fc4bfdcb5 am: 6271d783df
...
Change-Id: Id99cfee39744982eff373b49934e2e446c49499b
2020-03-31 08:47:03 +00: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
6271d783df
Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 am: 9fc4bfdcb5
...
Change-Id: I205f7b781f7c2a2ce955d99e82915c25fc6e5b66
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
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
