PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,074 Commits 1 Branch 0 Tags
451f6817e1ff8045d1d8e39af7a40166047b5901
Commit Graph

130074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hansen Kurli
9827ddae2a Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551

Change-Id: Ib480a948c3e2c1b68f9e1087c93d563d78792e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 08:59:02 +00:00
Hansen Kurli
3c569b5379 Merge "Create a new string to alert unsupported vpn start." into main 2023-11-21 08:21:33 +00:00
Hansen Kurli
e49454db98 Create a new string to alert unsupported vpn start. 
Test: Manual test
Change-Id: Ic32db48671335a59c3bf8b43065cfef7c39c2936
 2023-11-21 13:29:27 +08:00
Treehugger Robot
7aeaa3f425 Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7ef am: 144f0b8f80 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056

Change-Id: Id3aacf4a13959d38e6864fca4e9d77b4cf4ff0b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 04:22:38 +00:00
Treehugger Robot
1e4c05ef7c Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7ef am: 8a2a127435 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056

Change-Id: I34e1cefc34f737ecf1e4b13bf3a8839e7e3a4bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 04:20:49 +00:00
Treehugger Robot
8a2a127435 Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056

Change-Id: Idb4ebe7592c2bdf2685fb20c95b57c20565c0dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 03:49:50 +00:00
Treehugger Robot
144f0b8f80 Merge "Fix crash when clicking Spell Checker" into main am: e4f376f7ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2828056

Change-Id: I21dd16316a3db910b91207ed327315c43f64b8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 03:49:49 +00:00
Treehugger Robot
e4f376f7ef Merge "Fix crash when clicking Spell Checker" into main 2023-11-21 03:13:59 +00:00
Peiyong Lin
65fa36ef25 [automerger skipped] Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d am: 8600c40211 -s ours 
am skip reason: Merged-In I7f491151cc26dc10ccdb2900cfa81ff09c23b184 with SHA-1 8fc1391a75 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714

Change-Id: Iee34b30bb0b9f9496712446b37a6ef4e5996a1be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 02:41:37 +00:00
Peiyong Lin
4529fbd9c8 Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d am: bcefa0a8c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714

Change-Id: Ibf8523b64861a3ad47ae2c1af233774585c1f9c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 02:39:48 +00:00
Peiyong Lin
8600c40211 Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714

Change-Id: I23c68b9f715479af7a415ede10a2695d3a8c56ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 02:09:19 +00:00
Peiyong Lin
bcefa0a8c4 Merge "Unconditionally enable ANGLE developer option UI." into main am: 4e6db90f5d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2798714

Change-Id: Id58c91947beea82ad02fa2b83e2a536f27dea327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 02:07:48 +00:00
Peiyong Lin
4e6db90f5d Merge "Unconditionally enable ANGLE developer option UI." into main 2023-11-17 01:45:25 +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
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
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
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
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
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
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
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
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
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
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
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
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
SongFerng Wang
6a04355cb3 Merge "Add a config to hide "Enable wireless display" menu" into main 2023-11-14 04:52:43 +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
Hansen Kurli
1fd7fe6373 Use AlertDialog to alert Unsupported VPN type. 
Follow up of aosp/2822270. Show an AlertDialog instead of a Toast
when starting an unsupported VPN type.

Test: Manual test
Change-Id: I2ffb1bd48dcb91624012c404b8a6eed1df9b0b8d
 2023-11-13 20:46:38 +08:00
Hansen Kurli
53aac10cab Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 16fd898705 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: Ife7070b102904af0c5eb21bf3a899de9b01d79ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:54:06 +00:00
Hansen Kurli
c58030dcb0 Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed am: 3a33f7178f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I781d4ca1e43869586543737ad357093630202319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:52:32 +00:00
hoffc
f336657508 Settings: remove multiple users search when multi-user not supported 
When multi-user feature not supported in framework, SettingsIntelligence should not build the index of multiple users for searching.

Return empty list when multi-user feature not supported during building search index.

Change-Id: Id2fb8f2066784d63bbfd5c396da88b04306a3563
Bug: 310108420
 2023-11-13 14:36:32 +08:00