PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,018 Commits 1 Branch 0 Tags
98a522c45c84516b976fbdcb1531f0e5826d078f
Commit Graph

110 Commits

Author SHA1 Message Date
Bill Yi
d5ac034998 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d24b57dd0f06b53f62b135dbc3d92b01efd27c8
 2023-04-21 20:13:56 -07:00
Bill Yi
51a04e12bf Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I627c552f8da0bc57708bffa767acfdb1f4fe9e12
 2023-04-21 17:25:02 -07:00
Bill Yi
1191199e91 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9c7161d4b46e81abb26d8f46ab957268ef620dd0
 2023-04-18 02:41:31 -07:00
Bill Yi
630293f38d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I46820cabb9e344157ab7d70c5242e5ee0f2581d5
 2023-04-17 21:35:46 -07:00
Fabian Kozynski
25cc8f2fce Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: If4e9398bb55ccdc93538ef7e42b8eb827107d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:22:58 +00:00
Fabian Kozynski
f7885593ec Merge "Update strings for device controls settings" into udc-dev am: 2099f58d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22623556

Change-Id: I55256e32cc23cd7beafc2f0d6df38e165e0e6077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:21:56 +00:00
Fabian Kozynski
2099f58d3e Merge "Update strings for device controls settings" into udc-dev 2023-04-17 18:06:33 +00:00
Bill Yi
bfb5780a19 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-13 17:18:38 +00:00
Fabián Kozynski
68270077e3 Update strings for device controls settings 
Test: Manual, check Settings
Fixes: 234757968
Change-Id: I5fcb8c2a5826271fc9bf1cfff50006c3f738e46c
 2023-04-13 12:58:30 -04:00
Bill Yi
cb2bb50cd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Hao Dong
e5946f6858 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: I8e08c8cb75e1ae7c794be59081b12c48a79f0735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 18:30:51 +00:00
Hao Dong
08bd7960c3 Fix biometrics unicorn consent string bug. 
Test: manual test
Bug: 277815321
Change-Id: Id32720807d0c6aec199dcd13449f9333d2c36978
 2023-04-12 00:31:25 +00:00
Bill Yi
38c1c29c4e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iacbc0b525f11529743bf25507687eff791788072
 2023-04-11 11:00:07 -07:00
Bill Yi
54bb26194d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia39d5d1486164a03bc61521292b02f7f91b4163c
 2023-04-11 00:01:47 -07:00
TreeHugger Robot
a1b725232d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
TreeHugger Robot
d3dd46984a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-03 23:14:11 +00:00
Hao Dong
8aae584706 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930

Change-Id: Ib890de88266fea8aeee3b17038b2f55979799cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:53:07 +00:00
Hao Dong
637ae9d983 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev 2023-04-03 21:06:40 +00:00
Bill Yi
e29a9fb4ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d9f04335f9d38e35c8bebd63d32c2eddf7f5661
 2023-04-02 17:54:23 -07:00
Bill Yi
10dcb7b74a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I26773573f3bd95ca50b4020ed338568b589771bb
 2023-04-02 16:52:48 -07:00
Bill Yi
e9faa25ab9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-31 22:19:18 +00:00
Hao Dong
322df0454f Show Class 3 consent screen in enrollment with strong face. 
Test: atest FaceEnrollIntroductionTest
Bug: 271903097
Change-Id: I1959a82862790ff918571145b3651d164aa118b6
 2023-03-31 20:11:44 +00:00
Bill Yi
cadf15af82 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-31 19:51:51 +00:00
Hao Dong
5b159df4f0 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: Ic64e0e8fe81d3e881b356e60d360ff9729876faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:33 +00:00
Hao Dong
3e2efc17c6 Merge "Post-enroll settings screen shows class 3 strings" into udc-dev am: 9ff72e4205 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22314938

Change-Id: I4dfa3809e0649903559d24b210666a1c2eca5856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:19:27 +00:00
Hao Dong
b0ff672a7e Post-enroll settings screen shows class 3 strings 
Test: atest FaceSettingsFooterPreferenceControllerTest
Test: manual test
Bug: 274959218
Change-Id: I2e30666baf36a48a47e9ed9e4e046cefc805995a
 2023-03-31 03:05:57 +00:00
Bill Yi
a9769b4d95 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a1bb2d170607168a88421b3f7507c01e63993f2
 2023-03-28 21:08:53 -07:00
Bill Yi
31c51eb0d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ida241a0f9ff5416920d158611a6547b81c0ce776
 2023-03-28 18:00:19 -07:00
Bill Yi
17be9ad028 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I92ec4dd42a14943a3d286f46f9be260f07bbed1f
 2023-03-22 09:01:14 -07:00
Bill Yi
6a2956d8f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id5f1e2b04c372627f2fde37fc8139bf1a6bc3068
 2023-03-16 16:53:20 -07:00
TreeHugger Robot
56c868f611 Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: I550e308c0f8317dab5495c531d89fd35f9d8d477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:47:23 +00:00
TreeHugger Robot
9550f8b0fc Merge "Update incompatible charging string for different product" into udc-dev am: 36d78f8fe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988525

Change-Id: If1abf6420e3beaf6839850a38ea770df9b4bb5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:46:51 +00:00
ykhung
28e22dd726 Update incompatible charging string for different product 
Bug: 271775549
Test: presubmit
Change-Id: Iec7b91b2bcb018f51127b54e500be9c53d75515b
 2023-03-14 00:49:08 +08:00
Bill Yi
3c3f35c7dd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9426f51c0dc4c7ef8fbd6294d10d87277f1f55d3
 2023-03-09 02:58:16 -08:00
Bill Yi
a2c986d8aa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I24a13c2e635ecc5e57eb2c85db73a01ef6088801
 2023-02-27 09:45:29 -08:00
Bill Yi
1eb8b786fe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia84568d79f6f53c1502bb2c322e95d668fa5564a
 2023-02-27 04:32:39 -08:00
Zaiyue Xue
cc9df56ed4 Fix b/265364509 Update battery usage page footer string 
Bug: 265364509
Fix: 265364509
Test: manual
Change-Id: I1deef3157ae7c5a8425e2ae438dacebcadd25fce
 2023-02-22 15:55:51 +08:00
Zaiyue Xue
67fd7d8f6f Move the same-name-different-product configs from res folder to res-product folder 
This could unblock the build in go/settings-studio.

Bug: 269974284
Fix: 269974284
Test: presubmit
Change-Id: I962ce24c827d6412af2b861753ae57bd17a27de2
 2023-02-20 14:06:09 +08:00
Bill Yi
2050fddfa7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I791947de566749a689f7a3e067065384ad741efc
 2023-02-09 20:08:07 -08:00
TreeHugger Robot
b6cc92a9b8 Merge "Update Turn off when charged summary" 2023-02-07 09:29:03 +00:00
Wesley Wang
97b5dcdba7 Update Turn off when charged summary 
Bug: 260302647
Test: make SettingsRoboTests
Change-Id: Ife871ca500dacba15dd88074d8a61dcf8d77c81e
 2023-02-07 15:51:33 +08:00
Bill Yi
92f273e513 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If1ca3081f14c0d5c6bf49850b65d60894e7c34c2
 2023-02-05 19:34:56 -08:00
Chaohui Wang
87257eccac Move product specific strings to res-product 
Move the followings,
- lockpassword_confirm_your_pattern_details_frp
- lockpassword_confirm_your_pin_details_frp
- lockpassword_confirm_your_password_details_frp

Product specific strings need to be put in res-product.

Bug: 250807976
Test: Make Settings
Change-Id: I5916a254a9e42ed365f6d26deedd9879636606f7
 2023-02-02 14:15:05 +08:00
Milton Wu
1cef4545c8 Update fingerprint introduction string 
Update introduction string to show device name

Bug: 251727719
Test: Manually check FingerprintEnrollIntroduction and
      FingerprintSettings page
Change-Id: Ie44a5e3e41e0ff2acaaa2388b04068b218da1c67
 2023-01-31 05:28:42 +00:00
Chaohui Wang
608a9934f7 Move product specific strings to res-product 
Move the followings,
- security_settings_fingerprint_enroll_finish_v2_message
- security_settings_fingerprint_enroll_finish_v2_add_fingerprint_message

Product specific strings need to be put in res-product.

Bug: 250807976
Test: Make Settings
Change-Id: I6928c8d126bb91456f3b2214e85cab8b6608f532
 2023-01-28 22:36:11 +08:00
Bill Yi
61f104e8c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50e44cc7b2ef0ec5127e45c82438576d86f72f2d
 2023-01-23 07:03:53 -08:00
Zaiyue Xue
fd25f404f8 Fix the build failure in studiow. 
The b/21010898 changed the security_settings_sfps_enroll_find_sensor_message
in branch tm-qpr. But in the branch master
security_settings_sfps_enroll_find_sensor_message has been moved from res to
res-product. The merge cl ag/21024400 should update the message in the
new place instead of adding it back to res.

Test: manual
Change-Id: I9ccc08be15631bff5e70ad146ba3761689206658
 2023-01-19 12:35:16 +08:00
Bill Yi
4cf4ed7c7a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3b51a03c3cc8bb0c2d04b325d5108278792228a7
 2023-01-15 19:27:58 -08:00
Zaiyue Xue
4221504e43 [Battery usage U] [UI] Update the text in footer 
Bug: 265088249
Fix: 265088249
Test: manual
Change-Id: If112f7a0b3509cdf11f1ffcea233ab3ace2bf6d7
 2023-01-11 11:10:54 +08:00
TreeHugger Robot
d54c9cab7d Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-01-05 20:06:08 +00:00