Commit Graph

24064 Commits

Author SHA1 Message Date
Curtis Belmonte
541b30dadb Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e am: cfe62d534c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510

Change-Id: Ic94a1fa3d30294cf4bdb20b20a3494dbd3d14313
2021-07-13 17:00:08 +00:00
Curtis Belmonte
cfe62d534c Merge "Add "eyes open" setting message to face enroll intro" into sc-dev am: e796b8bf6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15147510

Change-Id: I37772fb054bfc4e3a15cc25131ea7bda6d05d0a5
2021-07-13 16:45:47 +00:00
Curtis Belmonte
e796b8bf6e Merge "Add "eyes open" setting message to face enroll intro" into sc-dev 2021-07-13 16:36:53 +00:00
Bill Yi
4e7a021a3f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1907d2b0f31200d7a55ab9b8e4f305e031428f93
2021-07-13 06:56:33 +00:00
PETER LIANG
af75689866 Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a am: 1910983174
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070

Change-Id: I7deb6a77708f25de31578774be050edb4f66bf80
2021-07-13 00:46:53 +00:00
PETER LIANG
1910983174 Merge "Update the preview image of caption preference fragment." into sc-v2-dev am: 00c2fb2a4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15221070

Change-Id: Id02ecb6d4533e0864c71c22a2fcf9016ce349c92
2021-07-13 00:34:25 +00:00
PETER LIANG
00c2fb2a4a Merge "Update the preview image of caption preference fragment." into sc-v2-dev 2021-07-13 00:23:30 +00:00
Curtis Belmonte
68c12f2e04 Add "eyes open" setting message to face enroll intro
Adds an additional message about the "Require eyes to be open" setting
for Face Unlock to the intro/consent screen of enrollment, gated by a
config flag.

Test: Manual

Bug: 192272785
Change-Id: Idcd2395a290b74f4578898fdfebd05b81cd74075
2021-07-12 17:05:45 -07:00
Treehugger Robot
0e371c63ae Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f am: bc08889feb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I7d2cf24adabc90a1446be0f261888c24b77b494b
2021-07-12 11:10:41 +00:00
Treehugger Robot
bc08889feb Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a am: b664dbe93f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: Ic56026cffaa57fa4cc8a66c65f34ac833e30a624
2021-07-12 11:02:20 +00:00
Treehugger Robot
b664dbe93f Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8 am: 476c3dc62a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I53b5765f78098e466379454d228dda47cc007aa9
2021-07-12 11:01:58 +00:00
Treehugger Robot
476c3dc62a Merge "Revise strings for the NFC developer option" am: 8dd6ce02d8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1762584

Change-Id: I48ab5a9d8bd431e6e9854d9f3c36373f95118cf6
2021-07-12 10:49:01 +00:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
2021-07-12 16:39:22 +08:00
Bill Yi
e3343dcb23 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18a4de23bbd4151ba9b9bba1b74867667a108f8f
2021-07-12 01:26:09 +00:00
Bill Yi
f360fb7f80 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95d60c69d8b002a5714a5ec18f0cf3026e10ab60
2021-07-12 01:22:27 +00:00
Bill Yi
a54853c370 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c13a26cab7ced9bf9f3e4938557830cdc4c53ee
2021-07-12 01:18:24 +00:00
Bill Yi
fc4e91569b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d67ba9fa6d73187fdb02387c9baa3c60da43da4
2021-07-12 01:01:09 +00:00
Bill Yi
80494f3b36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9743e34ecaaec254b43ced73ad24c93a917dbe6d
2021-07-10 23:13:40 +00:00
TreeHugger Robot
0543cd0231 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-10 02:01:32 +00:00
Bill Yi
becb6d091c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iac93f20d863db9b7ec8335150421940c3724dc5f
2021-07-10 00:14:00 +00:00
Meng Wang
f91d19ae7d Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: 3e5b063766
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I6f9759680f39f8b5661c9867339e613c2159d296
2021-07-09 23:00:37 +00:00
Meng Wang
744c9ec231 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96 am: b92327498b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: Ia331c0ceb3a54416417d83379906c3167d186b56
2021-07-09 23:00:11 +00:00
Meng Wang
3e5b063766 Merge "Refine WFC location notice text." into sc-dev am: d43986fa96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: I5c13502898e86af3a39854b77e8b2a856b0139e9
2021-07-09 22:45:02 +00:00
Meng Wang
eef4b8fd1a Merge "Refine WFC location notice text." into sc-dev am: d43986fa96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15224306

Change-Id: If9feedd87413eff719bb695791e52bda4f5a7263
2021-07-09 22:44:07 +00:00
Meng Wang
d43986fa96 Merge "Refine WFC location notice text." into sc-dev 2021-07-09 22:30:44 +00:00
Becca Milman
b25c6234bc Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: 32f84cc057
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I3f94ad09a9983fbe8bb41330703d3f79f022fbe2
2021-07-09 17:21:19 +00:00
Becca Milman
263ed9fc0e Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f am: aeb4301efa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I5d7238fb9daf5fb88a2a17fd8baa9c19ac30594e
2021-07-09 17:20:26 +00:00
Becca Milman
6fdf6b293f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I702c25bf724f34ba6d114cf07fbee3cdbbb6f495
2021-07-09 17:08:40 +00:00
Becca Milman
32f84cc057 Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev am: 06a92e109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237437

Change-Id: I89966f6d42faa17df97d5d9311ef9a95311c4ba3
2021-07-09 17:07:44 +00:00
Becca Milman
06a92e109f Merge "Removed nested GlifRecyclerLayout on choose_sim_activity.xml" into sc-dev 2021-07-09 16:55:31 +00:00
Meng Wang
17ef8294c3 Refine WFC location notice text.
Bug: 190642193
Test: manual - see updated screenshot in the bug.
Change-Id: Ia417c8486dc324a65e41bfb667eaaf3bc9894033
2021-07-09 09:39:03 -07:00
TreeHugger Robot
78b9774e94 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: 3ec3e800ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2921c82267a16f9e020c30cbeb00724b77f096f2
2021-07-09 16:36:26 +00:00
TreeHugger Robot
e214bba97f Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932 am: e21b555d0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I29bda54bbea61c7256c128267aed85f4cf17b7e0
2021-07-09 16:35:59 +00:00
TreeHugger Robot
3ec3e800ff Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: If503f1ef170b0a8b3a150607d38b78d0ba36bae8
2021-07-09 16:27:50 +00:00
TreeHugger Robot
abf8a9ea63 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev am: 2a149d9932
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15237712

Change-Id: I2e0acdcfa86fef13eef290357fe148d3ad1806da
2021-07-09 16:27:03 +00:00
TreeHugger Robot
2a149d9932 Merge "Remove learn more from smart-auto-rotate privacy string" into sc-dev 2021-07-09 16:14:20 +00:00
YUKAI HUNG
da6dd6e630 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev am: a1e610b689 am: 04dc2ec138
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15236915

Change-Id: I8727082a70f36d9ca172386b7446c56ee50d8765
2021-07-09 07:11:55 +00:00
YUKAI HUNG
04dc2ec138 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev am: a1e610b689
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15236915

Change-Id: I8c8c63740bb1e7c270bea039ceaad4939ec8420d
2021-07-09 06:56:09 +00:00
YUKAI HUNG
a1e610b689 Merge "Remove items from not allowed show summary list (legacy rule)" into sc-v2-dev 2021-07-09 06:43:14 +00:00
Bill Yi
42d5aa754b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibd6f492b43759b0d6ca66bd0c95b4acb29bbbedb
2021-07-09 06:29:21 +00:00
ykhung
b6d95d1c4f Remove items from not allowed show summary list (legacy rule)
Bug: 191991503
Test: make SettingsRoboTests
Change-Id: Ieadc97eddcbd149e04ec85477859a9b3ffd8f06b
2021-07-09 11:13:26 +08:00
Abel Tesfaye
3be761fc48 Remove learn more from smart-auto-rotate privacy string
Test: locally with flame

Bug: 192087097
Change-Id: I9dba949571f8c931a839cdf15b0d6e607fa4e6b4
2021-07-08 23:21:38 +00:00
Peter Wang
00c8f25333 Removed nested GlifRecyclerLayout on choose_sim_activity.xml
[Submitting on behalf of beccamilman@]

Bug: 193000379
Test: Build
Change-Id: Ic850f2ee84162fbcf609fa1f9715cec31de73bea
2021-07-08 14:21:45 -07:00
Bill Yi
7c2a910199 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2045140919e5d3829713eac17d2a3d313f1e3022
2021-07-08 15:35:59 +00:00
Edgar Wang
40820d2ffe Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 7458b770f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I85f81794536854f29613b5d42922b5297c34ec01
2021-07-08 07:14:33 +00:00
Edgar Wang
4db6c2142f Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 4ecc3f433d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I6811347b998cf658d6f0742f9ea017aaa2c4f60d
2021-07-08 07:13:48 +00:00
Edgar Wang
7458b770f9 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I10796c5a289712c8b34a0332ae04d078d1d5e562
2021-07-08 07:01:01 +00:00
Edgar Wang
cecc33b5c4 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Iaca806e315ebbd6a7e37daca444ee368b2e79e16
2021-07-08 07:00:43 +00:00
Edgar Wang
4ecc3f433d Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Idee77d5fc6c6e174abc32a9ac40e10a71a3bacae
2021-07-08 07:00:19 +00:00
Edgar Wang
723ab59bc0 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev 2021-07-08 05:58:30 +00:00