PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,890 Commits 1 Branch 0 Tags
794f5153ecec2041c896246d9e4b249dd50fd12e
Commit Graph

129890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
c5d1832610 [automerger skipped] Merge "settings: Remove @hide NFC API usage" into main am: 75a49e0abb am: e234fe3281 -s ours 
am skip reason: Merged-In I6f87ad7ae03c67aaa2ddb0ac2529debc53278ba8 with SHA-1 0d11f492f7 is already in history

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

Change-Id: I5b74c83ddceb3367f619c761734ccf7a576be9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-30 19:02:06 +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
Bill Yi
a9007d74d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d71154e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3fd125d577e54a26b1486a19517d5522250e960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-30 18:45:03 +00:00
Roshan Pius
e234fe3281 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: I8d1c96e7232958e40885dfcf7ff58ce38340e410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-30 18:31:30 +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
Bill Yi
5c3d71154e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iad5b125cb9a7b90beda38d098f5853c2868f5227
 2023-11-29 18:31:38 -08: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
92844e1744 Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64 am: 7f849bdaac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094

Change-Id: Ied8c96cd60c627fc55a1793c35138c78e1292dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-29 04:11:58 +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
7f849bdaac 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: I6b244829ad28cd3175def5feb7ced27c6453d2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-29 03:43:14 +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
Bill Yi
875ae1db39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c2f669606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I975b2f9be421bef7e15e811e91a4ec0e286dd85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-22 19:49:02 +00:00
Bill Yi
1c2f669606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32c505e31630b342cada77404500d3a8c9ca00c9
 2023-11-21 10:55:32 -08:00
Hansen Kurli
b4cb5019ef Merge "Create a new string to alert unsupported vpn start." into main am: 3c569b5379 am: 9827ddae2a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2831551

Change-Id: I516e6f18f0addc16663f10ca4efe65584d3f0a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-21 09:31:32 +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
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