Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,099 Commits 1 Branch 0 Tags
2d70fb39af2c9e4fca1c29a1594ae69568ec7b4a
Commit Graph

50040 Commits

Author SHA1 Message Date
Pawan Wagh
2d70fb39af Merge changes from topic "16k_dev_ui" into main am: 052a1658e4 am: 7b96c4e57b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987

Change-Id: I0dd9f6b90752512b0b74a9d2222d188665fb1e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 21:25:10 +00:00
Pawan Wagh
7dcfe67cae Show progress bar till the applyPayload returns am: 9be05afc88 am: 0aebae8d79 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2766345

Change-Id: Ibaf92a15e52ad5e7f1834210196c94d521ad90d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 21:25:06 +00:00
Pawan Wagh
ba35fbc238 Call update engine to apply payload am: 008842edeb am: d2110a76a7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2756951

Change-Id: I2e0013a3f62fa945005f6ceaf2ff3ca184c2ba8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 21:25:02 +00:00
Pawan Wagh
8e5eff37a9 Developer option for booting with 16K pages am: 8996ca9768 am: acd2de2533 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2705817

Change-Id: I8882b9feb7b34567de5f8a65d8932dac42446529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-12 21:24:56 +00:00
Pawan Wagh
905b78e4a5 Publish update info via SystemUpdateManager 
When 16K OTA is applied, this info would need to be published
to a SystemUpdateManager so that we don't clobber the updates with
other pending updates. Similarly, Fetch the pending update info from
SystemUpdateManager before applying update.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 302391134
Bug: 295035851
Change-Id: I4998122942d7f2defd69bc34474230c8aea3c25a
 2024-01-12 17:33:56 +00:00
Pawan Wagh
9be05afc88 Show progress bar till the applyPayload returns 
Displaying a progress bar till the applyPayload from update_engine
returns.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 298214075
Change-Id: Ic8cf4df700505e7f10185ee0f08225411c6621e5
 2024-01-12 17:14:03 +00:00
Pawan Wagh
008842edeb Call update engine to apply payload 
Calling update engine to apply payload provided from boot_otas and
reboot on success. Updating different dialogues for 4k prompt.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Enable16kPagesPreferenceControllerTest
Bug: 295573133
Change-Id: Iab90a2c2fae5f6aefce95b2306db91c7b056d9f7
 2024-01-12 17:13:31 +00:00
Pawan Wagh
8996ca9768 Developer option for booting with 16K pages 
Adding developer option to boot with 16K compatible kernel. Adding
resources, layouts and dialog classes for 16k option. This needs
to integrated with update engine to make OTA switch happen.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 294614538
Change-Id: I3a24fed059eee99407e3486a7254285e0e4a251c
 2024-01-12 16:51:16 +00:00
SongFerng Wang
8663deec9b Using ACTION_SIM_CARD_STATE_CHANGED to detect simSlotMapping is complete am: e51d8515c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25809891

Change-Id: I0bed6503fbce6204b2da75f6dc25364148f1ce8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-01-05 07:23:19 +00:00
SongFerng Wang
e51d8515c0 Using ACTION_SIM_CARD_STATE_CHANGED to detect simSlotMapping is complete 
Sometime modem can't return the GET_SIM_STATUS immediately, so that the settings send the sim switching too early after simSlotMapping.

Bug: 291733084
Change-Id: If547c8b02020bc86c83915334e29945176a4ee9f
Test: tester will test it manually.
(cherry picked from commit ba2a86ad9f)
 2024-01-05 03:38:30 +00:00
Jason Chiu
2a29d67710 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 am: 36dc648ca5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: If9497561d0efa2311a18886105a1ce02709373be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-26 09:18:32 +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
4f1ec8cb8a Merge UQ1A.231205.015 
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
 2023-12-07 15:48:03 -08:00
Chaohui Wang
4cccd18ef8 Check isSimHardwareVisible earlier am: b731e63096 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25498055

Change-Id: I19c7182a8207c48f99bc6730a88c10e839b5e6ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-05 07:12:53 +00:00
Chaohui Wang
794f5153ec Async load eid in SimEidPreferenceController am: d3cc9b20e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25498123

Change-Id: I32a34923fdf9943a51bce3571977a328e33b3a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-05 07:12:45 +00:00
Chaohui Wang
b731e63096 Check isSimHardwareVisible earlier 
In SimEidPreferenceController, to reduce flaky on no SIM devices.

Bug: 304560734
Test: manual - on "About phone / tablet" page
Test: unit test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b7e6c28bcef0788b4fc637af16dcaef32a16c14)
Merged-In: I07ae9b785d0fbe24a866883080a466a2110ca68f
Change-Id: I07ae9b785d0fbe24a866883080a466a2110ca68f
 2023-12-04 10:10:29 +00:00
Chaohui Wang
d3cc9b20e4 Async load eid in SimEidPreferenceController 
Avoid data loading in getAvailabilityStatus() to prevent ANR, override
updateNonIndexableKeys() for search availability.

Fix: 304560734
Test: manual - on "About phone" page
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6e44ce818a5284a612a31e0d451a33f9e1ce93e)
Merged-In: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
Change-Id: I9994abf3787f5db0edc71ff48d08e549a4b70bf7
 2023-12-04 07:53:34 +00:00
Roshan Pius
ac2f252ec8 Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: da05498175 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2851159

Change-Id: Iadfb1f67802dbec8ff68271d7199ca83edd3b9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-30 19:00:17 +00: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
e4f1aa8098 Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64 am: 51a0475c44 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094

Change-Id: I3dc5181c72a6e99964b5681ec275c35eece2e6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-29 04:09:41 +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
b7ba4be4b3 Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379 am: 42ad676a4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551

Change-Id: Iea863ecae495cd1273c8bb77ca61ee488b147865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 09:30:49 +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
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
e4f376f7ef Merge "Fix crash when clicking Spell Checker" into main 2023-11-21 03:13:59 +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
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
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
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
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
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
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
8136e6d397 Merge "Disable factory reset in DSU mode" into main 2023-11-15 08:07:44 +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
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