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
Bill Yi
451f6817e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d62083085 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75b61ec0bd8d8b376b61223b6a42a192766b590f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:36 +00:00
Bill Yi
c2702b560b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2b26b470ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44d559aa0103827ec78fa37a9116b0365c4a28d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:32 +00:00
Bill Yi
96dc00525b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa1bfc7d04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4c6e569abc2d5ac5eef6d2e331e33bc14d129e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:22 +00:00
Bill Yi
d2b4db0ac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7af5937f90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I271fb4a230c55266fa8ce4b09c52fb1d295ad025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:05 +00:00
Bill Yi
2b26b470ec Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-12-27 22:26:10 +00:00
Bill Yi
7d62083085 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf84f378f3b906951a36c3c61ef7e9da9dbd9092
 2023-12-26 16:29:46 -08:00
Bill Yi
fa1bfc7d04 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If2aa5e6d3d7c3c72f973ab142ac09dccfa4703ef
 2023-12-26 16:26:50 -08:00
Bill Yi
7af5937f90 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21ddd8b4ba7ef60791f304d38a466d80d6ec3073
 2023-12-26 16:23:29 -08: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
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
Bill Yi
1dec72e3ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 063e533a49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d9085b2009c0f0d445a72055925637fdd12d90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 18:53:44 +00:00
Bill Yi
23a484796f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9cfebc93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49ea01cbe49c14d11bc8269eddebb425e825ec21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 18:53:29 +00:00
Bill Yi
ba227a44b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2300cd1453 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0065653f0154b8d18d41e2e7ac53922377fb44e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 18:53:13 +00:00
Bill Yi
063e533a49 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-12-15 18:18:42 +00:00
Bill Yi
2300cd1453 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b88806e0d579e17355af3107724987fb657faf9
 2023-12-13 16:21:13 -08:00
Bill Yi
4e9cfebc93 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If08f28f0fb48e5969968d05b1533e89892dc64dc
 2023-12-13 16:18:14 -08:00
Xin Li
c118ba99fa [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 32cdca80cc -s ours am: 5cd5689267 -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: I41ee10d0c4c60f9777907275260404156def2d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:05:10 +00:00
Xin Li
36a2f3cc93 [automerger skipped] Merge Android 14 QPR1 am: 784b56d43f -s ours am: 7d2f4be0ba -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: I07ee696955ad4f1b7f5952539da6f6c299328429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:17 +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
e72aefc106 [automerger skipped] Merge UQ1A.231205.015 am: 4f1ec8cb8a -s ours 
am skip reason: Merged-In I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c with SHA-1 fdf80bd5c9 is already in history

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

Change-Id: I8326d3adfea2de2f71271b65f4673bf9dc251125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 08:21:19 +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
Bill Yi
62cd606a6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f07dacd7f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d63b75d278ba416ae939443c5e3f0225bafa88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 00:38:45 +00:00
Bill Yi
f07dacd7f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If70d2c088105c88880860b4283014a43522b2db9
 2023-12-05 13:11:59 -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
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