Commit Graph

28230 Commits

Author SHA1 Message Date
Becca Hughes
d9ce857fd5 Merge "Update strings based on UX/product feedback" 2023-02-24 19:45:33 +00:00
Zaiyue Xue
c6166bc07d Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev am: ae0d935dcc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502689

Change-Id: Ib0c1ebd27bc65db95fccae3a67514b7687d662b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 13:31:35 +00:00
Zaiyue Xue
ae0d935dcc Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev 2023-02-24 12:55:21 +00:00
Vincent Wang
731ded4f9a Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev am: d17704196f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578805

Change-Id: I5afdcebedeff7b17cbcf3499d2b81c09502eedac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 12:19:01 +00:00
Vincent Wang
d17704196f Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev 2023-02-24 11:42:26 +00:00
Zaiyue Xue
6d939b34dc Fix b/265387286: The total percentage of all apps is not 100%
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
2023-02-24 19:19:28 +08:00
Vincent Wang
882b49c8fb Refactor FingerprintEnrollEnrolling to fragment
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
2023-02-24 08:43:17 +00:00
TreeHugger Robot
4f884ca030 Merge "Clarify string for translation" into udc-dev am: 6d3a9b40d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534693

Change-Id: Id2f1480e4996f8c4e1856cede8a3adf3907a88bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 21:13:58 +00:00
TreeHugger Robot
6d3a9b40d4 Merge "Clarify string for translation" into udc-dev 2023-02-23 20:28:58 +00:00
Daniel Huang
7b587ade21 Merge "Change key name "Meta" to "Action key"" into udc-dev am: 6e6b067863
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21552503

Change-Id: I0cc034d2300eed8fb08ca163dbcaea19fbde7e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 14:48:39 +00:00
Daniel Huang
6e6b067863 Merge "Change key name "Meta" to "Action key"" into udc-dev 2023-02-23 12:50:31 +00:00
Bonian Chen
550b5a0ba1 Merge "[Settings] Customizable resource for hiding 3G preferred network type" into udc-dev am: 7d76797f94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548828

Change-Id: I5c12ad23a240fbe70630855e5f98b5be83912674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 12:03:46 +00:00
danielwbhuang
b8e1799527 Change key name "Meta" to "Action key"
1. In the modifier key remapping page, the string "Meta" should be changed to "Action"
2. We should add the default focus effect when users go into this page first time.

Demo: https://screencast.googleplex.com/cast/NTA2NjA2MzEyMjI2ODE2MHw2YjRjOTljMi0xMQ

Bug: 269981968
Test: manual
Change-Id: I481be0370166a8831bedc721751e23cee3b39703
2023-02-23 18:01:15 +08:00
William Escande
17a6f54b56 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I94a513c6fc45aed0922f0747da4856c42a5bcf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:09:02 +00:00
Bonian Chen
a9717482a7 [Settings] Customizable resource for hiding 3G preferred network type
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.

Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local

Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-02-23 09:04:50 +00:00
William Escande
4df2d78817 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ied121b87732ecf6603441a61678be5f5c5f89829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:46:59 +00:00
William Escande
6ea3322de4 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:11:05 +00:00
William Escande
57f3e9428f Merge "Snoop Logger: fix descriptions" am: 5fd265405c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 07:21:57 +00:00
William Escande
5fd265405c Merge "Snoop Logger: fix descriptions" 2023-02-23 05:58:19 +00:00
Becca Hughes
0172ff6942 Update strings based on UX/product feedback
Update settings strings for cred man based
on feedback.

Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
2023-02-23 00:36:16 +00:00
Bill Yi
00181c65d8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
Bill Yi
02895aca61 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
Bill Yi
d2394e7eb2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
TreeHugger Robot
d7b8a73da9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
TreeHugger Robot
7d1dbd3e1e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
TreeHugger Robot
2593eaea99 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
Julia Reynolds
e39c0bbe8b Clarify string for translation
Test: view string in UI
Fixes: 243971120
Change-Id: I7f21df52b831e87447a7001acd16b3e1e5325372
2023-02-22 15:47:14 -05:00
Brian Lee
79effa02d3 Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev 2023-02-22 20:34:17 +00:00
Jack Yu
86a6c6a9a7 Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:15:02 +00:00
Jack Yu
0797feaf7b Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:30:37 +00:00
Brian Lee
ad2660c0fc Update RemoteLockscreenValidation detail strings and char limits.
Test: Manual
Bug: 270203601
Change-Id: I3d8f707955de49f790e30314b1ff919eb474d138
2023-02-22 09:40:24 -08:00
YK Hung
629782cc88 Merge "Fix b/270290013: Updates battery usage system component icons" into udc-dev 2023-02-22 15:06:44 +00:00
Zaiyue Xue
7350621d40 Fix b/270290013: Updates battery usage system component icons
Bug: 270290013
Fix: 270290013
Test: manual
Change-Id: I92cda88269fdee767b00cd1b9aa78062015a5095
2023-02-22 18:23:20 +08:00
Zaiyue Xue
ca973f43cf Fix b/270296263: Updates screen system component name to "Display"
Bug: 270296263
Fix: 270296263
Test: manual
Change-Id: Iaa42c5576b856ea523dfa8fe92554a82779a62ce
2023-02-22 17:23:55 +08:00
Jeff DeCew
da1f2578a0 Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c am: 05c43c2edc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: Id8d24e0960947e53fc309d1e3f6fd776a204677b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 02:39:05 +00:00
Jeff DeCew
05c43c2edc Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: Ie06a7625785dd3c82a50d5e3b1e24b44b54c02ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 01:38:58 +00:00
Bill Yi
48957d9e2b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5b49fa939841cbd2af7ddc54bd3bf773dd36b916
2023-02-21 17:26:14 -08:00
Bill Yi
1051b47c26 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaee6c70775a043a98864c0f8fb413d92048035f6
2023-02-21 17:17:02 -08:00
Bill Yi
899ab27b2f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id105be6dcfce31f16760f5bafd90cf697beeff68
2023-02-21 17:13:24 -08:00
Jeff DeCew
3c5bbbdb0c Merge "Do not cache the bubble settings illustration" into tm-qpr-dev 2023-02-22 01:06:41 +00:00
Florian Mayer
7450e5cf38 Fix string annotations.
The char limit was applied to the wrong string.

(cherry picked from commit 36dd04b1be)

Bug: 270174344
Merged-In: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
Change-Id: I27cce80b4cfb6d570d1f4a870f3f49b788d0e3f7
2023-02-21 19:03:43 +00:00
Bill Yi
9e9dc0ab83 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4ae6dcb265dd6d41036c6d4edb0ab0d1bf43bea6
2023-02-20 23:38:35 -08:00
Bill Yi
d222947eff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If6e477440d9a01b546c1531305cf82bef0aae90c
2023-02-20 23:33:59 -08:00
Bill Yi
2181b97ef8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic5659cc2201c7ee88caae347b5c9e8ced94c485d
2023-02-20 23:29:46 -08:00
tom hsu
3978f7c4a7 [Regional preferences] Modify Temperature and Nubmering system title. am: 02f4727ada
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21505314

Change-Id: Ieb5338503fc29ab07d5afbe20edc9753e45614b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-21 05:50:32 +00:00
tom hsu
02f4727ada [Regional preferences] Modify Temperature and Nubmering system title.
Bug: b/265878199
Test: Manual test. See b/265878199#2
Change-Id: I5d2b6f3c6ca9552889702a9f289b37c6de9d99f8
2023-02-21 03:12:13 +00:00
Jakub Rotkiewicz
c0a7e8f8f0 Snoop Logger: fix descriptions
Test: refactoring CL. Existing unit tests still pass
Merged-In: Ie6a6b27247896e2a9a410197135e44a22ab1428c
Change-Id: Ie6a6b27247896e2a9a410197135e44a22ab1428c
2023-02-20 15:12:31 +00:00
TreeHugger Robot
f1cdd73bf0 Merge "Move the same-name-different-product configs from res folder to res-product folder" into udc-dev am: ae2c14a039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21502690

Change-Id: I66e335ce1fb14ba677f1fb7fe9460870286c98d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-20 14:16:13 +00:00