PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,839 Commits 1 Branch 0 Tags
37417cc4f8775f8c8ca9fbac91523bfff42c7fcc
Commit Graph

62839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tim peng
f8c57507e2 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 
Change-Id: I441ae31c111143bfd5dea06e2179e1644d86ca52
 2020-03-31 03:13:25 +00:00
tim peng
774620f543 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 1106c19951 
Change-Id: Ie11c1cc084213b3196d97ef0eca0f7fa018288a6
 2020-03-31 03:13:08 +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
1106c19951 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
 2020-03-31 02:45: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
24848171d3 [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 skip reason: subject contains skip directive

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

Change-Id: I8369808c740c4be08c8ea250082fb1fdf23e4365
 2020-03-31 00:50:51 +00:00
TreeHugger Robot
a383b959ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours am: 50699d4595 -s ours 
am skip reason: subject contains skip directive

Change-Id: I7a5fd91ca07762f44965e4a2873b92129a8e534a
 2020-03-31 00:50:33 +00:00
TreeHugger Robot
50699d4595 [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: I660c2a7e46b4c055e417e955a9e9b99aadca3052
 2020-03-31 00:25:29 +00: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
8c7a574507 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e am: 931ea77cc3 
Change-Id: Ifb47c6d171397534931b4dea4ae161be0e704beb
 2020-03-30 23:45:27 +00:00
TreeHugger Robot
4a08ac176f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-30 23:39:52 +00:00
TreeHugger Robot
931ea77cc3 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 0c0dc0f64e 
Change-Id: I18cfc1ccb3d631a90f4917fcb7ee976eee7cc0c3
 2020-03-30 23:09:53 +00:00
TreeHugger Robot
0c0dc0f64e Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d 
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
 2020-03-30 22:51:13 +00:00
TreeHugger Robot
599f02eab1 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd 
Change-Id: Icb82bc3fd94d56b94c275ad2bbb80b78b8bbf1dc
 2020-03-30 22:13:07 +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
0ad036bd31 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 am: 43919ede30 
Change-Id: I230ba561a691f74f5b78f8f96593ad8bb3686b69
 2020-03-30 21:27:46 +00:00
Julia Reynolds
7b60612e01 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d am: e7ed0da17a 
Change-Id: Ib6f6449d83c8166831aea45a4ad772c08d595fec
 2020-03-30 21:25:41 +00:00
Julia Reynolds
6271a3e226 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad am: 7368dcdc8c 
Change-Id: I592a20b0148374bbfb94cee8fa92b3d55771a32d
 2020-03-30 21:23:23 +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
1b29a5a2ba Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 
Change-Id: Id082b3e1822fbffb6be9373f5da0c1ff8b25cfa3
 2020-03-30 20:51:24 +00:00
Julia Reynolds
2db927cb79 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: fdf32b618c 
Change-Id: I6856e49fcff85168115621da46ad66c38bc43bb8
 2020-03-30 20:51:20 +00:00
TreeHugger Robot
43919ede30 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: dfdb9d18f8 
Change-Id: I72d53cad79daaaa17e3e66e576574c20edcf6b57
 2020-03-30 20:51:16 +00:00
Julia Reynolds
41874f9f73 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea 
Change-Id: I77c60b21d864ffb1dfac182a244895c9b59774fa
 2020-03-30 20:51:15 +00:00
Julia Reynolds
e7ed0da17a Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 am: 5c44faa98d 
Change-Id: I178c73fcd8924adaf0528878f558e6a3509419a1
 2020-03-30 20:51:11 +00:00
Julia Reynolds
7368dcdc8c Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 8fcac244ad 
Change-Id: I5205d2bbc8dfa6c28a5dc927de9e8c4a32db487d
 2020-03-30 20:51:03 +00:00
TreeHugger Robot
dfdb9d18f8 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd 
Change-Id: Ib59231d29edd5747afdf73053c837d796c2e0922
 2020-03-30 20:39:11 +00:00
Julia Reynolds
5c44faa98d Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 
Change-Id: I233bcf4e9ba089718534186437472db15b6c87ba
 2020-03-30 20:39:06 +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
8fcac244ad Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec 
Change-Id: Icdeaafe85fa03ed0ee03379bcb41995be18d46dd
 2020-03-30 20:39:02 +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
Julia Reynolds
17ee537e91 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 
Change-Id: Ib0e9448a41bcfdecfd2b541201ee79d6aaa883b4
 2020-03-30 20:18:34 +00:00
TreeHugger Robot
f61da397fd Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf 
Change-Id: I0c72a61512a8faf17835b1b212b909de69980995
 2020-03-30 20:18:29 +00:00
Julia Reynolds
1dc6ae3d5f Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 
Change-Id: Ib1222663c41432bb4439f0fbf54c7effbae73809
 2020-03-30 20:18:22 +00:00
Julia Reynolds
52b375b242 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 
Change-Id: Ibd13d19b4bf335c14a1063422943e8e65a549c4b
 2020-03-30 20:18:22 +00:00
Julia Reynolds
6d30804cec Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 
Change-Id: I3504ff5e96055ce63098d738f7390cb5c3c3569b
 2020-03-30 20:18:13 +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