Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,647 Commits 1 Branch 0 Tags
e9207083f504ce73592ce7e157597e6ce144aeaf
Commit Graph

31204 Commits

Author SHA1 Message Date
Bonian Chen
5b4acedda6 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: fa83a139ca am: c6c4b5def6 
Change-Id: I46c047359257ddd5cb3e331add4856b01c5c9739
 2020-03-31 17:03:06 +00:00
Bonian Chen
f5ed98caf3 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 855152fd22 am: f5b033015a am: f6a8037223 
Change-Id: Ied285b1b5347564db52d29aa1ea59a66a8df69f1
 2020-03-31 17:03:04 +00:00
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
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
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
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
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
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
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
7fb6f35c3a Merge "Show all apps that requested cross profile permission" into rvc-dev 2020-03-31 13:09:31 +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
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
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
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
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
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +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
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
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
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
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
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
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
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
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
kholoud mohamed
4d0edf369f Show all apps that requested cross profile permission 
show all apps that requested the permission, show the admin
restricted dialog if the app is not whitelisted by the admin,
and show a link to install the app if the app is missing in one
of the profiles.

Bug: 149742043
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest

Change-Id: I2bc86b9966a2e14a12ee8f4b7f1b75f866ed98e3
 2020-03-30 21:10:40 +01:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Julia Reynolds
56d45997b3 Merge "Remove bubble settings from channel pages" into rvc-dev 2020-03-30 20:01:17 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
TreeHugger Robot
3b0e0f6b60 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47 am: 54058eedca am: e705d2ce91 am: 1fd4ebb841 
Change-Id: I42cd43c19e765a85b72da1ec4c8470cc6dc70689
 2020-03-30 19:05:25 +00:00
Yanting Yang
7cfc3a4212 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 6b42c0780e am: c3716819c6 am: 126b9e9a44 
Change-Id: I61ab316ad024e9fe8b143e24f6e5ea24ae85418b
 2020-03-30 19:04:41 +00:00
TreeHugger Robot
bb2a4aa264 Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d am: 052610467e am: a2b560931a am: b569a4db40 
Change-Id: I400f28d517347cd318b00bc5d7e3cc75c31d2515
 2020-03-30 19:04:24 +00:00
Julia Reynolds
cb355e0fb8 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005 am: 5ba1c6e55d am: 380bb6d519 am: 1a4c34029b 
Change-Id: I997bc55f7ba1a9d87071826cd887350f98352ef7
 2020-03-30 19:04:06 +00:00
TreeHugger Robot
63420a1f66 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951 am: 99ab33a0fa am: 4448e97222 am: 430a95ab19 
Change-Id: Ide6f46939421ac2c620047055651919c71b2ecf0
 2020-03-30 19:02:01 +00:00
TreeHugger Robot
14254c0876 Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa am: 0d761a25bd am: 7f2015849f am: 455b7f4b44 am: 389cdf8792 
Change-Id: Ic035bd9e0b1ca3c6175b748d895f0663f9e07b0d
 2020-03-30 19:01:40 +00:00
Bonian Chen
a326e2ebf7 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 4b42ba7807 am: f667a40821 am: 1de29efee7 
Change-Id: I29cc7573f5082a777e7091e5eaf38f2ea77362b2
 2020-03-30 19:01:22 +00:00