Commit Graph

63674 Commits

Author SHA1 Message Date
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
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
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
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
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
TreeHugger Robot
cfcc352af6 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
2020-03-31 05:03:23 +00:00
TreeHugger Robot
f833efefdb Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 am: 43919ede30 am: 0ad036bd31
Change-Id: Iae0393bb6e336a51a5c996115ae449934d23579d
2020-03-31 05:02:50 +00:00
Julia Reynolds
54a3fca8d7 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d am: e7ed0da17a am: 7b60612e01
Change-Id: I191db08025586d43fa6bf21805de4ae1c2f6f862
2020-03-31 05:02:07 +00:00
Julia Reynolds
b38c9b551b Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad am: 7368dcdc8c am: 6271a3e226
Change-Id: Id2fbeb126f542b5881d4d6abeb8cfd5fb96f925e
2020-03-31 05:01:40 +00:00
TreeHugger Robot
bc1687c94f Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 am: 1b29a5a2ba
Change-Id: Ia90ec22e76476867615f4482e27c55434e50bb10
2020-03-31 05:01:12 +00:00
Julia Reynolds
43848a4093 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c am: 2db927cb79
Change-Id: I70729282db462779734fc7e29ae6a43d2e8eef70
2020-03-31 05:00:45 +00:00
Julia Reynolds
139f0ccf07 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea am: 41874f9f73
Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
2020-03-31 05:00:16 +00:00
Julia Reynolds
a5de5f20bf Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: acbf2b36e4 am: cf2ff6cc61 am: 5124fa67cc
Change-Id: I019b3ca534013c01cf8397100f8ca1ed1e644039
2020-03-31 04:59:48 +00:00
Julia Reynolds
e004d14655 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da am: 19ba74919f am: 2554c8d8b8
Change-Id: I55e4edd27cc9a59bb2cca94ab7f55902fb87b762
2020-03-31 04:59:10 +00:00