Commit Graph

64152 Commits

Author SHA1 Message Date
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
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
a2411f9c3c Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 am: 3c4dffc470
Change-Id: I45977c850977be84c0dc1f6461e68a1941efc1a2
2020-03-31 07:29:37 +00:00
Bonian Chen
3c4dffc470 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8
Change-Id: Ibb3fe8013b6de42c2aa2526b6a2e40e3ec3e1a95
2020-03-31 07:15:48 +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
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
aa94953649 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6 am: bebee5c18e
Change-Id: I7c47427bdd8f33ba29e09780492582d69770e335
2020-03-31 06:16:05 +00:00
Jason Chang
cc6b079130 Merge "New strings for One-Handed mode settings (gesture)" 2020-03-31 05:58:30 +00:00
Jason Chang
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +00:00
TreeHugger Robot
76d2bd2f1c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a am: ab9a994fcd
Change-Id: I8982dfc9a4ea527f210e5634035e6b391f4c4945
2020-03-31 05:21:32 +00:00
tim peng
85cbce813c Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 am: f8c57507e2
Change-Id: I4c9eaaf3b244f657bb6cc32a31526b22f535a20a
2020-03-31 05:20:51 +00:00
TreeHugger Robot
2ef7ebefc1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours am: a383b959ac -s ours am: 24848171d3 -s ours
am skip reason: subject contains skip directive

Change-Id: I841cb1ed9cc87031b3b9bd29ccd5d4124ead0562
2020-03-31 05:20:06 +00:00
TreeHugger Robot
2807098cee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: d87a2cb1f3 -s ours am: fe1309d723 -s ours
am skip reason: subject contains skip directive

Change-Id: I58b4af029c1e9d60b36151890c7a019aa26cdb3d
2020-03-31 05:17:53 +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
bebee5c18e Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 am: 210c260ce6
Change-Id: Ib374cc0970383c55e61a76fe941a8fbfa8963dc1
2020-03-31 05:15:32 +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
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
e8be88a0fc Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e am: 931ea77cc3 am: 8c7a574507
Change-Id: I88a5627d8a21698258d053b14a19ec3e40ffd8a5
2020-03-31 05:03:52 +00:00