Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,098 Commits 1 Branch 0 Tags
00a78fca4167aaa4e88efc8a86a0883e27fcacad
Commit Graph

76 Commits

Author SHA1 Message Date
YK Hung
c2e7b61ee9 Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 am: 5007841ebd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: If3a00b355020c1307999684330297e4a388ba8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:28:29 +00:00
YK Hung
5007841ebd Merge "Update tablet help article link (1/2)" into udc-dev am: a4f67e02c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695285

Change-Id: Id6b352d47918565fac42659529c97d1b4c89606f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 07:01:29 +00:00
YK Hung
a4f67e02c8 Merge "Update tablet help article link (1/2)" into udc-dev 2023-06-20 06:34:46 +00:00
Wesley Wang
ddbb5bcd5c Update tablet help article link (1/2) 
Bug: 287122689
Test: make SettingsRoboTests
Change-Id: If09f7a6aab01f00bdb1675444237698643e6ba93
 2023-06-15 14:38:59 +08:00
Bill Yi
58628e0170 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2daf643f4601e64d83742cfbf1d895e8b272bc98
 2023-06-12 13:36:39 -07:00
Fabian Kozynski
6812734387 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 am: b7d25fdf3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: Ia06abaf07d312a9526320469c699159fa1c4c0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 19:16:13 +00:00
Fabian Kozynski
9bbac9f715 Merge "Fix typo in product string" into udc-dev am: d3df7f5090 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23600032

Change-Id: I18c217922a8725f376f02e9f6d07d10de3cac891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 18:32:29 +00:00
Fabian Kozynski
d3df7f5090 Merge "Fix typo in product string" into udc-dev 2023-06-09 17:44:36 +00:00
Fabián Kozynski
5ec8f8d315 Fix typo in product string 
Fix the typo so the string displays in the correct products.

Test: manual, using tablet product
Fixes: 284007230
Change-Id: I970c214f46e0d30ecb92ff8f24c6f3fd8dfe33e3
 2023-06-07 12:45:41 -04:00
Bill Yi
ea2e6b3670 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7229c084aa7704cde5a57d7635bd0fb2113fca6
 2023-06-04 18:46:55 -07:00
Bill Yi
b57ebe9c3b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If0dd51dfcd926f41da7f563eff00939b54fb2f03
 2023-05-29 01:01:54 -07:00
Bill Yi
197ad03f9e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I87f8876ce96c7a84d149ecfec08378ce67fb595d
 2023-05-22 16:54:54 -07:00
Bill Yi
f32482d0d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If69f95a7588531f8bca477e812b746d8b6cde5b4
 2023-05-16 21:45:26 -07:00
Bill Yi
6b8c61c9a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica68575ce29c2ca9f82bfc8a694750f589fbb492
 2023-05-09 19:19:35 -07:00
Treehugger Robot
30fe673ac9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-03 20:55:59 +00:00
Treehugger Robot
80bbca1866 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae am: c3d6820ffd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Iae2aec7301d3c73b86b84638b0c0993a79168b1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 20:20:21 +00:00
Treehugger Robot
0624c88484 Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: If3d83edcabc4249b963666b8d1d83a2eab0e45e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:37:39 +00:00
Treehugger Robot
c3d6820ffd Merge "Update auto_rotate_summary string for different product" into udc-dev am: 7244f3a0ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985400

Change-Id: Id1f507633ad33b5b0719dba4bc507e73ce7832e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 19:36:46 +00:00
Edgar Wang
e416e27543 Update auto_rotate_summary string for different product 
Bug: 279769863
Test: presubmit
Change-Id: I98ceddc54bf5ea27cf862e96fe6358b3b885db0b
 2023-05-03 17:44:42 +08:00
Bill Yi
6096cceb3c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If492025e729d55de4965fecb78a01471ee031f28
 2023-05-02 12:53:06 -07:00
Bill Yi
75997c0291 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia77f9d73eb09f3b732bb573c285f0a708bdc6d48
 2023-04-27 15:15:59 -07:00
Bill Yi
4f92177ec1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8bb3a96d150426d63a01488f6e20d43ba0241388
 2023-04-21 20:15:16 -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
84c81f27dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I44e550e9606eb4b356466de5cfe7f3115c245d61
 2023-04-18 02:42:44 -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
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
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
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
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
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