Oli Thompson
ae10f49ab8
Guard against duplicate calls to setQuietModeEnabled
...
check if quiet mode is already in the desired state before calling
setQuietModeEnabled
Bug: 303722527
Bug: 293441361
Test: atest WorkModePreferenceControllerTest, atest
ManagedProfileQuietModeEnablerTest
Change-Id: I6a809b6f1b9a78382dccb1cc8b0ae4d8c88fa51a
2023-11-17 15:06:07 +00:00
Bill Yi
59709d4031
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2f2335e4e1
-s ours am: 529fb1143a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25377920
Change-Id: I2174ce5b54f5cb0644d3319dadfccb16157e1123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:56:53 +00:00
Bill Yi
529fb1143a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2f2335e4e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25377920
Change-Id: If6846fbeb441bb3de0954f89689650b4afc146b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:41:19 +00:00
Hansen Kurli
2e91e49755
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
am: 6262b3b67b
am: 9481ee51f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: Idb05db35538f26f14d3bae128115958279ae7ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:40:14 +00:00
Hansen Kurli
283cf1b75a
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
am: f151e8bdd0
am: 579b7b3457
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: I04e1ac5cd25b39c4b409731607444ccd961d53fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:39:33 +00:00
Bill Yi
fc93c90c43
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-11-16 12:38:28 +00:00
Hansen Kurli
9481ee51f6
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
am: 6262b3b67b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: Id96daca808a7584f19fb834cadb334343b4f1228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:07:37 +00:00
Hansen Kurli
579b7b3457
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
am: f151e8bdd0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: I9547d0f94eea5e872345ca54b34fc58df2529f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 12:05:49 +00:00
Hansen Kurli
f151e8bdd0
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: I741bcfd4484ef711d3190c94c7dd4f2a1c325fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 11:34:15 +00:00
Hansen Kurli
6262b3b67b
Merge "Use AlertDialog to alert Unsupported VPN type." into main am: 643136bba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2824760
Change-Id: Id5f8aeab1f1605b4660ebaf2a3b6d56442c33868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 11:34:11 +00:00
Hansen Kurli
643136bba6
Merge "Use AlertDialog to alert Unsupported VPN type." into main
2023-11-16 11:08:33 +00:00
Manish Singh
7f9a319fa9
Merge "Don't add private profile accounts to Personal tab" into main
2023-11-16 09:33:41 +00:00
YK Hung
e43645952f
Merge "Update setDenylist() input structure" into main
2023-11-16 08:02:58 +00:00
Bill Yi
44430350fa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44068604d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25377918
Change-Id: Id28fb1c5ca7b5ad6f699714243dcb3c75a7e20d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-16 07:31:47 +00:00
Wesley Wang
24278e7a92
Update setDenylist() input structure
...
- Change the input type from list of String to Integer
- Update test case
Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I018ef49523810577b17375628e45c24270a3bdf4
2023-11-16 07:07:52 +00:00
Chaohui Wang
1a2bf18eae
Merge "Fix restriction to configure Calls & SMS" into main
2023-11-16 03:32:37 +00:00
Yuanru Qian
97cf66efe4
Merge "Fix a CHAR LIMIT mistake for a BT message as requested by linguists" into main
2023-11-16 03:27:13 +00:00
Chun-Ku Lin
e0852d25f7
Merge "Don't show quick settings tooltip if the user is in the Setup Wizard, since the user can't access the Quick Settings Panel." into main
2023-11-16 03:03:57 +00:00
Wa Gao
3185a36b90
Update the unit test and add key to fragment.
...
Bug: 298076922
Change-Id: I8ed880c4f81bd76adc27af9bc3ba66f0b4697f74
2023-11-15 23:44:11 +00:00
Yiyi Shen
c03d4e7952
Merge "[Audiosharing] Add a util class for audio sharing." into main
2023-11-15 15:00:52 +00:00
Manish Singh
9e0437bc5b
Don't add private profile accounts to Personal tab
...
If there are no tabs to show then the single Passwords & accounts page
shows all the profiles under the corresponding headings.
No tabs are shown only when the PS is locked and there's no work
profile. And if PS is locked then we don't want to show any PS setting.
On the other hand if PS is not locked then we'll have tabs.
Bug: 309423484
Test: manual
Change-Id: Iebc62fbc4caf21988af6aa1af4fbd570f4c80ada
2023-11-15 13:58:57 +00:00
Manish Singh
aa91f1db3a
Merge "Reset Private Space settings on new space creation" into main
2023-11-15 13:55:12 +00:00
Manish Singh
7a556b851c
Reset Private Space settings on new space creation
...
Also added PrivateSpaceMaintainerTest
Bug: 310217645
Test: atest PrivateSpaceMaintainerTest
Test: atest HidePrivateSpaceControllerTest
Test: manual
Change-Id: Ic1096fd652d23ae6aa9da1421017c08f6bc480aa
2023-11-15 12:54:20 +00:00
Wesley Wang
2dec2b2785
Merge "Apply dynamic deny list into data usage state" into main
2023-11-15 12:53:25 +00:00
Jigar Thakkar
093cde0538
Merge "Enable auth check for profiles with shared credentials" into main
2023-11-15 12:41:14 +00:00
Yiyi Shen
83798bfbc5
[Audiosharing] Add a util class for audio sharing.
...
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: Iea5d4faa83eeef2d7104b9c31679e9226b75f4a6
2023-11-15 11:22:41 +00:00
Treehugger Robot
ef46750399
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
am: 1fc8f8aa6f
am: 0fe8889f3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: I7e3e8a858f6ab6d1845280b18f48a4e4b075af52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 11:18:23 +00:00
Treehugger Robot
af25484200
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
am: 202b3b147b
am: 12d5f62933
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: Ica69ec04685462749e97c2afde61d307dd4564b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 11:17:32 +00:00
Treehugger Robot
0fe8889f3e
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
am: 1fc8f8aa6f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: I41e6368c4eab12ec24df4b7837daf8cd3d9d3d35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 10:31:10 +00:00
Yuanru Qian
0fa4039098
Fix a CHAR LIMIT mistake for a BT message as requested by linguists
...
Bug: N/A
Change-Id: I8f7ee4c572421c0207edd49b8b5540a399fb4749
2023-11-15 10:31:04 +00:00
Treehugger Robot
12d5f62933
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
am: 202b3b147b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: Ia78e7ef744fc72d54deb6326a541cc3a73980ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 10:29:20 +00:00
Wesley Wang
f0b67ef0f9
Apply dynamic deny list into data usage state
...
- Initiate and sync existing network policy when creating the instance
- Imple a method to suggest list of packages to set as POLICY_REJECT
- Reset/clear the policy settings once clear storage or reset
preference
Bug: 306329984
Test: make SettingsRoboTests
Change-Id: I10ba28fee08c29bc2092820fbc8d8ac0e61d30e7
2023-11-15 18:25:19 +08:00
Howard Chen
744f024ec5
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
am: 5fbc97e95b
am: 869a83ef9d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: I7fda5115ff3c092f509a82e59699f8fb79b45f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:57:40 +00:00
Treehugger Robot
1fc8f8aa6f
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: Ia5eabd6aac492f061cec177e3eded2202936fb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:57:11 +00:00
Treehugger Robot
202b3b147b
Merge "Settings: remove multiple users search when multi-user not supported" into main am: 5a9826b844
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2827270
Change-Id: I5a9b318d5ce194fc7b4623a1d68085dd43b4a4da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:57:05 +00:00
Howard Chen
663c05e524
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
am: 8524cc8afd
am: 9a7e7e0ed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: Id60b855b716ceba64b1fbc7137c9c059ba237fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:55:37 +00:00
Zoey Chen
57ee1f29b5
Merge "[Panlingual] Should show confirm dialog when use the action of accessibility to change the default locale Bug: 303777391 Test: manual" into main
2023-11-15 09:40:44 +00:00
Treehugger Robot
5a9826b844
Merge "Settings: remove multiple users search when multi-user not supported" into main
2023-11-15 09:28:00 +00:00
Howard Chen
869a83ef9d
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
am: 5fbc97e95b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: Id41e935f66a10f4391c02572ed03ca7211a3d103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:07:47 +00:00
Howard Chen
9a7e7e0ed9
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
am: 8524cc8afd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: I91cd840928de7e9afa192b29a0d66a083b55e98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:05:19 +00:00
Howard Chen
8524cc8afd
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: I1020e5af5af7f91446d3afd290b643429163eb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:35:33 +00:00
Howard Chen
5fbc97e95b
Merge "Disable factory reset in DSU mode" into main am: 8136e6d397
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2814174
Change-Id: I17e5a6e93874acb40a801ed9c444a175df0d2ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:35:00 +00:00
Hansen Kurli
2934cc084c
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
am: 3be22c2063
am: 3530fb3954
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: Ieaadd6a839e00728e2560adc93df87b9f1fd78d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:33:40 +00:00
Hansen Kurli
54627f0798
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
am: 6d96b61bfa
am: 0a173b2618
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: I60593753806b8804b2647bd9251f630b6203a764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 08:32:47 +00:00
Howard Chen
8136e6d397
Merge "Disable factory reset in DSU mode" into main
2023-11-15 08:07:44 +00:00
Hansen Kurli
3530fb3954
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
am: 3be22c2063
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: I350296acf6720cf5505a0b6a9d02b9c7104b9609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 07:45:09 +00:00
Hansen Kurli
0a173b2618
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
am: 6d96b61bfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: Icfcc1db2845a86a32ea34e98e8eaa8c699dd89bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 07:42:57 +00:00
Hansen Kurli
3be22c2063
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: I655c9bfb720ab79f205bbd814a801cfbf1ced754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 07:09:16 +00:00
Hansen Kurli
6d96b61bfa
Merge changes I7a017026,I76a5c940 into main am: 520d7c6758
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2819338
Change-Id: I8341c0f82c7ca00dba4cf2590d37d25f9d1072ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 07:09:08 +00:00
Yiyi Shen
07f2b54496
Merge "[Audiosharing] Impl a base controller for audio sharing page." into main
2023-11-15 06:43:07 +00:00