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
Chaohui Wang
7cb01f2f1e
Reduce flaky of whenIsInstantApp_hasSummaryForInstant
...
Wait for enabled summary instead wait for title.
Bug: 288353352
Test: unit test
Change-Id: Ifaf713fd3b781401701f1c8770a7a2a2de0f673f
2023-11-15 11:10:54 +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
Pingzhi Wang
42a7e4784a
Fix crash when clicking Spell Checker
...
Some variants do not have the default Spell Checker (GBoard)
pre-installed (typically Mainland China variants). Disable the
Spell Checker settings for such variants, to avoid crashes.
Bug: 310751714
Test: Manual
Change-Id: I1fb5a9959cffd26f3921e32226605a38636871b6
2023-11-14 11:34:17 +01: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