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
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
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
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
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
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
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
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
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
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
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
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
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
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
Hansen Kurli
520d7c6758
Merge changes I7a017026,I76a5c940 into main
...
* changes:
Remove the code of legacy VPN from Settings
Remove legacy vpn types from R.array.vpn_types.
2023-11-15 06:35:47 +00:00
YK Hung
ff40f003b8
Merge "Add protection for the ConcurrentModificationException" into main
2023-11-15 06:10:00 +00:00
ykhung
16b79cfdfb
Add protection for the ConcurrentModificationException
...
Fix: 310120803
Test: presubmit
Change-Id: I8526ed0c93570ba3e183b675b29bd9e9e1582f5a
2023-11-15 11:32:00 +08:00
Peiyong Lin
714490851f
Merge "Unconditionally enable ANGLE developer option UI." into main
2023-11-15 01:38:35 +00:00
Chun-Ku Lin
0f2cc34230
Don't show quick settings tooltip if the user is in the Setup Wizard,
...
since the user can't access the Quick Settings Panel.
Bug: 294560581
Test: manual
- Turn on feature flag: adb shell device_config put accessibility com.android.settings.accessibility.remove_qs_tooltip_in_suw true
- Modify the font scale in SUW, verify the QS tooltip doesn't show up
- Modify the font scale after SUW, verify the QS tooltip shows up
Test: atest SettingsRoboTests:com.android.settings.accessibility
Change-Id: I1d1a4f8f70ea3e1d929952d5c273de1b4cd80503
2023-11-14 23:30:49 +00:00
Treehugger Robot
24c989a070
Merge changes from topic "wv-dev-opt" into main
...
* changes:
Add feature flag for force L3 dev option
Add Widevine developer option to settings
2023-11-14 22:54:03 +00:00
Wa Gao
bd073bc18c
Merge "Hide the setting from the search when feature is disabled." into main
2023-11-14 22:16:32 +00:00
Kyle Zhang
519d26d8f0
Add feature flag for force L3 dev option
...
Bug: 301669353
Change-Id: I289bed846982e94584fdb067e84186a61587d578
2023-11-14 21:52:06 +00:00
josephpv
30e841ce75
Add One Lock settings inside private space settings page
...
This includes below changes:
1. Add new sub settings page in Private Space settings with option to
swithch between private profile lock and device screen lock
2. Call Private profile lock setup when swithcing to private lock from
screen lock.
3. Preference to change private lock when a separate Private lock is set
Bug: 308862923
Test: atest UseOneLockPreferenceControllerTest,
PrivateSpaceLockControllerTest
Change-Id: I0a6d8c7dfbd0ffea19db03ffd6dfe7aa520c9684
2023-11-14 21:27:10 +00:00
Wa Gao
6ffb674ff4
Hide the setting from the search when feature is disabled.
...
Bug: 310243923
Change-Id: Idb3b903f19d81825e6f721a87ec8c5238c86118d
2023-11-14 20:27:52 +00:00
Wa Gao
5c8204c502
Merge "Fix the NullPointerException in ContentProtectionTogglePreferenceController. Bug: 310658123" into main
2023-11-14 20:08:07 +00:00
Daniel Norman
64bfe882c8
Merge changes from topic "b-303511250-dedupe-warning" into main
...
* changes:
Tech debt cleanup: Consolidates A11yService warning dialog.
Includes android.view.accessibility Aconfig flags in Settings.
2023-11-14 18:56:15 +00:00
Yiyi Shen
21ed1b0358
[Audiosharing] Impl a base controller for audio sharing page.
...
The preference controllers attached to audio sharing page will extends
this base controller so that their visibility will be updated together
depending on the main switch state.
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: I3d37c87a128098a1b1a38cb8621be9a4d4e8c15e
2023-11-14 20:00:28 +08:00
Chelsea Hao
92fee9f552
Merge changes Icfeafa14,I775e640b,I8d0d8150 into main
...
* changes:
[Audiosharing] Create progressCategory to show stream.
[Audiosharing] Created audiostreams package.
[Audiosharing] Branch existing LE QrCode scanner.
2023-11-14 11:14:24 +00:00
Yiyi Shen
3efd326df6
Merge "[Audiosharing] Impl the join audio sharing dialog." into main
2023-11-14 11:03:13 +00:00
chelseahao
eef358eb92
[Audiosharing] Create progressCategory to show stream.
...
Bug: 308368124
Test: Manual
Change-Id: Icfeafa14ec57782f520e66df74332cdbe3ac5d9f
2023-11-14 10:28:48 +00:00
Yiyi Shen
475f87bedc
[Audiosharing] Impl the join audio sharing dialog.
...
Show the dialog when the first or second eligible remote device connected during the
sharing session;
Or when the second eligible remote device connected and
no sharing session.
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: If59025d60821b00c169e0d739f4b68c31ce4bbbd
2023-11-14 18:09:45 +08:00
Chaohui Wang
9e0bd18686
Fix restriction to configure Calls & SMS
...
Restriction UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS is added.
Fix: 278062379
Test: manual - apply restriction no_config_mobile_networks
Test: unit test
Change-Id: I87bf2269359bbceb989fa10524d55dd7ceb55de1
2023-11-14 09:48:52 +00:00
chelseahao
af0d38fbec
[Audiosharing] Created audiostreams package.
...
Also updated some resource names.
Bug: 308368124
Test: Manual
Change-Id: I775e640bb34a02ee104cefd9a396af6a9f2fbb6e
2023-11-14 17:23:37 +08:00