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
Chris Antol
54f6b164fa
Make Mainline Module update intent explicit
...
Change-Id: Iaacbebcb5328d50f0bdaa554782144315140e143
Test: Existing unit test
Test: on-device verified tapping UI element still navigates to Play's update screen (About phone > Android version > Google Play system update)
Bug: 278987474
2023-11-15 19:50:48 +00:00
Peiyong Lin
8fc1391a75
Unconditionally enable ANGLE developer option UI.
...
Bug: b/283781993
Test: atest CtsAngleIntegrationHostTestCases -c
Test: atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
Change-Id: I7f491151cc26dc10ccdb2900cfa81ff09c23b184
Merged-In: I7f491151cc26dc10ccdb2900cfa81ff09c23b184
2023-11-15 18:16:46 +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
Quang Anh Luong
0b77afa833
Use WifiEntry.shouldShowSsid() to show SSID
...
Bug: 300205461
Test: build
Change-Id: Ifd82297cbc6a84b05cbba70e96470ea2a52aaa0e
2023-11-15 07:42:03 +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
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
Bill Yi
2f2335e4e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5b1510979bad1842d72eac9481d15ac8a37f5474
2023-11-14 20:06:52 -08:00
Bill Yi
df6994fdde
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib785a4293d260aff1213d104fa787ef02981304c
2023-11-14 20:05:02 -08:00
Bill Yi
44068604d0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9f47cd1dabe7b44ffa8274d805d939f8b4dda10
2023-11-14 20:01:15 -08: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