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
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
Yiyi Shen
145733011c
Merge "[Audiosharing] Impl the switch audio sharing dialog." into main
2023-11-14 09:13:34 +00:00
Manish Singh
402385c6c2
Merge "Remove CreatePrivateSpace entry from Private Space settings" into main
2023-11-14 09:05:07 +00:00
chelseahao
74b9b9dbb4
[Audiosharing] Branch existing LE QrCode scanner.
...
Bug: 308368124
Test: Manual
Change-Id: I8d0d8150baedfee7d74f60a3c18ecbc93271cada
2023-11-14 16:53:10 +08:00
lucaslin
755662f72e
Remove the code of legacy VPN from Settings
...
IKEv2 VPN options are now functional, so removing the code of
legacy VPN. (i.e. PPTP, L2TP/IPSec PSK, L2TP/IPSec RSA,
IPSec Xauth PSK, IPSec Xauth RSA, IPSec Hybrid RSA)
Bug: 161776767
Test: Build pass, m
Test: Flash and manual test
Test: atest SettingsUnitTests:com.android.settings.vpn2
Change-Id: I7a017026adec2452254c78ef5e0ebf61ce1a9ecf
2023-11-14 16:01:16 +08:00
Hansen Kurli
e554d06665
Remove legacy vpn types from R.array.vpn_types.
...
Remove the legacy vpn types from R.array.vpn_types.
Since the array of vpn types are now all allowed, the case of
using mAllowedTypes is no longer needed and removed.
Since R.array.vpn_types no longer match the constants in
VpnProfile, a conversion is needed from the VpnProfile constants
to the selected type position and vice versa.
Bug: 161776767
Test: m
Test: Flash and manual test setup VPNs
Change-Id: I76a5c940acf08c6d6adfe6ff270f39808abf88ab
2023-11-14 16:00:59 +08:00
Zoey Chen
a8b9414f13
[Panlingual] Should show confirm dialog when use the action of accessibility to change the default locale
...
Bug: 303777391
Test: manual
Change-Id: I03c76a3f5672012470ef8256691a85e818ce4edb
2023-11-14 07:43:00 +00:00
Yiyi Shen
2a2a748db4
[Audiosharing] Impl the switch audio sharing dialog.
...
Show the dialog when a third eligible remote device connected during the
sharing session.
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: Ib6627b68ef3d70305e9136e09a079bb53a459b85
2023-11-14 15:31:45 +08:00
Angela Wang
c01677b676
Merge "Removes hearing aids settings page flag" into main
2023-11-14 06:47:36 +00:00
SongFerng Wang
aaedd35c6c
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
am: 9461ac87e8
am: 15f5c288b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: I88747c0057b32d3e14ea7e83bf9ebc2c8c6b73a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 06:26:36 +00:00
SongFerng Wang
9d4fae2784
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
am: 919149ceee
am: 5b865281fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: I97c6050ea31e7be1464eaede981fb2d5ec27822d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 06:26:23 +00:00
SongFerng Wang
15f5c288b3
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
am: 9461ac87e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: I3fc60791e9d13906aea439d8378941d330a473df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 05:56:42 +00:00
SongFerng Wang
5b865281fd
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
am: 919149ceee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: Ibadb5404e51cf60c5f0e6336772e6ccafc29e996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 05:54:53 +00:00
SongFerng Wang
9461ac87e8
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: I3e386820da6d8f8fbd7630cd67c983ae4f684899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 05:23:27 +00:00
SongFerng Wang
919149ceee
Merge "Add a config to hide "Enable wireless display" menu" into main am: 6a04355cb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2647051
Change-Id: I7aea20dab1bc3cede5a0d13475d9c3933d656b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 05:23:18 +00:00
Alice Kuo
cd783b244c
Merge "Show LE audio toggle summary as default connection is classic" into main
2023-11-14 05:10:11 +00:00
SongFerng Wang
6a04355cb3
Merge "Add a config to hide "Enable wireless display" menu" into main
2023-11-14 04:52:43 +00:00
Wa Gao
cd9c661b37
Fix the NullPointerException in ContentProtectionTogglePreferenceController.
...
Bug: 310658123
Change-Id: I249a76ff1f432cb76269b1ac2cc3fe26e86b2bae
2023-11-14 03:44:42 +00:00
Chaohui Wang
3300f2388a
Merge "Migrate MainSwitchBar in Settings to Material3" into main
2023-11-14 03:42:54 +00:00
YK Hung
4d11ab6e56
Merge "Update incompatible charger checking rule" into main
2023-11-14 02:47:29 +00:00
Chaohui Wang
a333c2a1a3
Migrate MainSwitchBar in Settings to Material3
...
Settings UI changed in this cl.
Bug: 306658346
Test: manual - on Settings pages
Change-Id: I06f0cef90453c20855e71ea96c7bca72d1fb1017
2023-11-14 10:40:43 +08:00
Roy Luo
ef2cd0640e
Update incompatible charger checking rule
...
Use COMPLIANCE_WARNING_DEBUG_ACCESSORY to mock incompatible charging
event as COMPLIANCE_WARNING_OTHER is being deprecated.
Bug: 308700954
Bug: 310660470
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Flag: ACONFIG enable_input_power_limited_warning ENABLED
Change-Id: Ib6f7cf253344db99a8cc1d06c59a5c35d40f736f
2023-11-14 01:44:06 +00:00
Bill Yi
e4300ace72
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e58050c2f5
-s ours am: ba17ea49b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25360948
Change-Id: I9bff5b409ae7ef503d1fe78714a4b25f6376afe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:21:20 +00:00
Bill Yi
ba17ea49b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e58050c2f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25360948
Change-Id: If2ac84e6e186ca1b8c819afc7518c69e9c5afd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:09:45 +00:00
Bill Yi
e58050c2f5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e48f165a79129fe82b622fdd0be2df01d985ef4
2023-11-13 13:26:59 -08:00
Jigar Thakkar
41cda1f8bb
Enable auth check for profiles with shared credentials
...
This change adds a separate block to handle auth checks for all profiles
that have the property alwaysRequireAuthenticationToDisableQuietMode set
to true. The force verify path is to be invoked for all such profiles
that share credentials with parent.
Test: m -j RunSettingsRoboTests or atest SettingsRoboTest
Bug: 293571176
Change-Id: Iec133bd9dfb22299cbd56ab811f341fa3957ead3
2023-11-13 20:14:33 +00:00
Mike Schneider
11d12705d7
Merge "Revert "Migrate MainSwitchBar in Settings to Material3"" into main
2023-11-13 15:25:16 +00:00
josephpv
499eab137f
Remove CreatePrivateSpace entry from Private Space settings
...
Bug: 309581188
Test: Manually verified the item is not shown in Private Space Settings page
Change-Id: I08dca5a07256855ef629aabc68dde9058c00d333
2023-11-13 14:59:13 +00:00
Mike Schneider
b8c4ca078f
Revert "Migrate MainSwitchBar in Settings to Material3"
...
Revert submission 25338737-settingslib_main_switch
Reason for revert: breaks packages/modules/AdServices/adservices/apk/tests/settingsgaota/src/com/android/adservices/ui/settingsga/SettingsGaUiAutomatorTest.java (https://android-build.corp.google.com/test_investigate/?invocationId=I66100010216561043&testResultId=TR33729044105357424 )
Reverted changes: /q/submissionid:25338737-settingslib_main_switch
Bug: 310546637
Change-Id: I7ab391d97ed5b784818121304ffa5e984bdf65c4
2023-11-13 13:27:23 +00:00