PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,884 Commits 1 Branch 0 Tags
36dc648ca5e4f4714258f93aa470bdb03e09ce3f
Commit Graph

129884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
36dc648ca5 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: I5b61af6e8d265bc62603554ff0236a62ba7f94a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-26 08:48:01 +00:00
Jason Chiu
4f4bb89a23 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main 2023-12-26 08:08:27 +00:00
Jason Chiu
706907b7b2 Finish HomepageActivity when it's not the root of a task and not singleTask. 
HomepageActivity should be the first activity in a task, or be launched
in singleTask mode. Finishing it will bring up the previous activity in
the task.

Fix: 297857732
Fix: 309045575
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
Merged-In: Iddcba1652060d755693dd20d0e350e3d6c1ae138
 2023-12-26 02:08:14 +00:00
Xin Li
5cd5689267 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: I0295ace8868448969c6e97d817ac85a042f3452b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:19:27 +00:00
Xin Li
7d2f4be0ba [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours 
am skip reason: Merged-In I22fa193e9846fdb998810c93c9c26344a40d89a9 with SHA-1 4f1ec8cb8a is already in history

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

Change-Id: Ie0309426ebc4ba2c6db303e08d87c4b940802db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:28 +00:00
Xin Li
32cdca80cc Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:59 +00:00
Xin Li
784b56d43f Merge Android 14 QPR1 
Merged-In: I22fa193e9846fdb998810c93c9c26344a40d89a9
Bug: 315507370
Change-Id: I4a3a51affce75afe081a0cc9197e0034e34fe82d
 2023-12-08 13:14:21 -08:00
Xin Li
4f1ec8cb8a Merge UQ1A.231205.015 
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
 2023-12-07 15:48:03 -08:00
Roshan Pius
da05498175 Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: Ic089b941505ff82eca32e9d82f9648909b30c267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-30 18:31:27 +00:00
Roshan Pius
75a49e0abb Merge "settings: Remove @hide NFC API usage" into main 2023-11-30 17:29:37 +00:00
Roshan Pius
0d11f492f7 settings: Remove @hide NFC API usage 
These @hide usages in other parts of platform need to be cleaned
up to unbundle NFC mainline module.

Flag: None (The NFC flag - `enableNfcMainline` has been promoted to trunkfood. Note these APIs are available as @hide even if not available in formal SDK until V)
Bug: 307352220
Test: Compiles

Merged-In: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
Change-Id: I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8
 2023-11-29 22:22:16 +00:00
Eric Biggers
51a0475c44 Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094

Change-Id: I038600e5177845571e80d65c24eb90278320e295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-29 03:38:30 +00:00
Eric Biggers
7ec6e27c64 Merge "Use isCeStorageUnlocked() in storage wizards" into main 2023-11-29 02:27:02 +00:00
Hansen Kurli
42ad676a4e 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: I6ee70a33d9c5739ee2e44dcef8158c5f2b7767e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 08:59:06 +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
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
e4f376f7ef Merge "Fix crash when clicking Spell Checker" into main 2023-11-21 03:13:59 +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
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
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
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
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
8136e6d397 Merge "Disable factory reset in DSU mode" into main 2023-11-15 08:07:44 +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
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
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
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
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
Hansen Kurli
3a33f7178f Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800ed 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270

Change-Id: I84a308d94aed266f5125977cd7a385c315a72047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-13 06:05:58 +00:00
Hansen Kurli
485e8800ed Merge "Catch UnsupportedOperationException of startLegacyVpn" into main 2023-11-13 05:27:07 +00:00
Bruno Kremp
0d0736c46c Add a config to hide "Enable wireless display" menu 
Add config_show_wifi_display_enable_menu to control whether to
display "Enable wireless display" menu at Settings->
Connection preference->Cast.

If persist.debug.wfd.enable is 1, "Enable wireless display" menu will be
shown at Settings->Connection preference->Cast. Add a config to hide the
menu when needed.

setHasOptionsMenu is invoked in onActivityCreated of the parent class of
WifiDisplaySettings. No need to invoke it in onCreate.

Co-authored-by: Jingqiu Zhao <jingqiu.zhao@sony.com>

Test: manual test
Bug: 289532978
Change-Id: I146fb8188e783fed98d9fe56050e384bc4cca052
 2023-11-10 10:43:40 +01:00
Hansen Kurli
eea7c3c8d5 Catch UnsupportedOperationException of startLegacyVpn 
startLegacyVpn may throw UnsupportedOperationException. Instead
of crashing Settings, catch the exception and show a Toast.

Bug: 161776767
Test: Manual test, connect legacy vpn profile and observe Toast.
Change-Id: I5947f2043aa68478f659b34531202f225eab4568
 2023-11-08 20:39:00 +08:00
SongFerng Wang
4362f09737 Merge "Fix the burst callback issue on the repository" into main am: a23320eedd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887

Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 09:41:19 +00:00
SongFerng Wang
a23320eedd Merge "Fix the burst callback issue on the repository" into main 2023-11-07 09:11:06 +00:00
Treehugger Robot
3521df9dca Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 04:48:36 +00:00
Treehugger Robot
85ca373e75 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main 2023-11-07 04:08:35 +00:00
t
784e52c9be Disable factory reset in DSU mode 
Bug: 302317901
Test: build
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
 2023-11-02 08:08:19 +00:00
Mengjun Leng
1871b8155f Fix the burst callback issue on the repository 
Prevents the callback when no sub entities changed to reduce
UI jank, besides, makes both variables mAvailableSubInfoEntityList
and mActiveSubInfoEntityList thread-safe.

Test: Manual
Bug: 279387799

Change-Id: I04f2a780de54e7528be6aeaf62bc8162e499aa97
 2023-11-02 07:18:54 +05:30
Eric Biggers
8f363f7290 Use isCeStorageUnlocked() in storage wizards 
isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it
clear what it does (considering that there are many types of user keys).
Temporarily, the method exists under both names.  Change
StorageWizardMigrateConfirm and StorageWizardMoveConfirm to use the new
name.  No change in behavior.

Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I5ffdd8ce048b1bc9e6161bf4fb546796765e5842
 2023-10-31 21:59:31 +00:00
Roshan Pius
ad01bf88a7 settings(payments): Use newly exposed formal API for CardEmulation.getServices() 
Bug: 307352220
Test: Compiles
Merged-In: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
Change-Id: Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96
 2023-10-31 18:19:37 +00:00
Treehugger Robot
ff03ce88ff Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364

Change-Id: Ic8c0f7ceec443aca5172cd38ede765781640dc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 21:03:30 +00:00
Treehugger Robot
e8df63f148 Merge "settings(nfc): Remove NFC beam settings" into main 2023-10-30 20:26:18 +00:00