PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,211 Commits 1 Branch 0 Tags
d06e16aba1113660f23c6acf673959962d1be2ee
Commit Graph

85211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d06e16aba1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1fa23143324065d3ac91d9fae05e3b54091406ba
 2021-09-18 16:56:46 +00:00
Bill Yi
a9a3180777 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours am: 75d96641c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b048391a6c3923516eaeb7892c9024e32e84840
 2021-09-12 13:27:26 +00:00
Bill Yi
25884c44b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours am: 2bc492b5a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie80c4fe0db505f2695e0175b8083a3ab06e147c8
 2021-09-12 13:27:23 +00:00
Bill Yi
75d96641c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieff57a9bcb1cb08bfff67c882d2d23d40bf8881c
 2021-09-12 13:11:17 +00:00
Bill Yi
2bc492b5a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c98246752b54a166967392171d412f79fa3dfce
 2021-09-12 13:11:08 +00:00
Bill Yi
98945e949e Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-12 12:57:50 +00:00
Bill Yi
0f159f7a96 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-12 12:57:24 +00:00
Bill Yi
7d4c3475b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-12 12:56:09 +00:00
Bill Yi
10d047524a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641 
Blank merge reason: commit message contains skip directive

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

Change-Id: I5d2a8eaa5039f9321a04756907740e76f46bbe12
 2021-09-11 09:10:04 +00:00
Bill Yi
a5d4317641 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I89637d7c6419239e93a6dd005268adcf378c2291
 2021-09-11 09:09:53 +00:00
Bill Yi
b2e42cabd4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9a37f3d6526c53393d047d99f8c19f2054e932f7
 2021-09-11 09:05:32 +00:00
Bill Yi
24917c6fce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id7feff6bce69e46b992f5062c6fe2679f3fdd429
 2021-09-11 09:02:07 +00:00
Bill Yi
7ad96282b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I833bb37f1ed91e685017879fefe173d30ab447fc
 2021-09-11 08:55:27 +00:00
Bill Yi
0aff4035e8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4a64879a0fd4b69657dd45a18463d70d04f61cde
 2021-09-11 08:51:47 +00:00
Kevin Chyn
6db48b9508 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: I6f61d1c1f7a56e8310665b3bd7e96bd16ce41ef2
 2021-09-08 08:25:57 +00:00
Kevin Chyn
0b40e09ba6 [DO NOT MERGE] Update enrollment edu asset 
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
 2021-09-08 00:09:13 -07:00
Presubmit Automerger Backend
620448800d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0afa87c3b7044979344179aafc4edb82669a0982
 2021-09-07 23:51:48 +00:00
Bill Yi
d770312ec1 Import translations. DO NOT MERGE ANYWHERE 
BUG:198847997

Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
 2021-09-07 23:51:36 +00:00
Presubmit Automerger Backend
ea65ae36c3 [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Bug: 198858684
Change-Id: If3e1b890e7bbc697535019b3f3545c9d1a0644c7
 2021-09-07 01:57:05 +00:00
Curtis Belmonte
e7849fb0dc RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll

Test: Manual

Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
 2021-09-06 18:56:38 -07:00
Curtis Belmonte
bb68c982de [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: I89a941373c69d41b40b111aa7fcd99aba2d14df6
 2021-09-05 00:11:05 +00:00
Curtis Belmonte
4592bf62a3 Update char limits for new UDFPS enroll strings 
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.

Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
 2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
57fb953a03 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I1d552d3d428f400d7182b2e4a3389d4c3b8d9ba6
 2021-09-04 20:49:33 +00:00
Curtis Belmonte
c84e18b253 Add new strings for UDFPS 4-stage enrollment 
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.

Test: Presubmit

Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
 2021-09-04 13:48:28 -07:00
Bill Yi
f1d1dea725 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e187054e6c573664edbb192171fc6a8a8e7835c
 2021-09-03 20:54:46 +00:00
Bill Yi
91f5a9be02 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fbf37460a4ea3d67c6431251c1f9c13d99781b4
 2021-09-03 20:54:40 +00:00
TreeHugger Robot
474e1253fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b4c4cb3942739374ab825a4685199ff633c3098
 2021-09-03 20:54:11 +00:00
Bill Yi
615fe425a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-03 20:36:09 +00:00
Bill Yi
088b27084b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-03 20:35:56 +00:00
Bill Yi
6178db1a47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:35:13 +00:00
Bill Yi
a7002a5a80 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:35:13 +00:00
Bill Yi
a8c5a69b8d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:34:05 +00:00
Bill Yi
0f47b7af50 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:34:05 +00:00
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
 2021-09-03 20:22:37 +00:00
Bill Yi
729b22ab1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee05cb245cac65f158837831a38a7ee8f8b4bf53
 2021-09-03 20:05:26 +00:00
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
 2021-09-03 19:55:43 +00:00
TreeHugger Robot
54dd7bc722 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39bd3ab2e0d04e53768b8f8b5ed3b7b4a7a743d1
 2021-09-03 17:34:03 +00:00
Bill Yi
94cfa8d5bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4cb70a6d62bef38bfd4a1bec498073e7a049b0b
 2021-09-03 17:33:32 +00:00
TreeHugger Robot
3a95d44f50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
 2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
 2021-09-03 17:15:14 +00:00
TreeHugger Robot
f1780afb1e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-09-03 16:50:43 +00:00
YUKAI HUNG
81decdadae Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: Id51f71a57433dd11eae2b3e50290c5d010afda4c
 2021-09-03 02:49:14 +00:00
YUKAI HUNG
3f1d329878 Merge "Hide Camera background running time in the battery usage screen" into sc-dev 2021-09-03 02:33:22 +00:00
Bill Yi
3c592eda3e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 
Blank merge reason: commit message contains skip directive

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

Change-Id: I01e8cfa05eb0ce3992fca191fe54e5fc1a6bbb7d
 2021-09-02 13:42:07 +00:00
Bill Yi
1336ffec20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
 2021-09-02 13:41:52 +00:00
Bill Yi
0345842b51 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 
Blank merge reason: commit message contains skip directive

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

Change-Id: I69e3af665e3c9efef3bd20d97b51088c4cfe47de
 2021-09-02 13:31:27 +00:00
Bill Yi
fb4f0b0820 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
 2021-09-02 13:31:17 +00:00
Bill Yi
8382ada407 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
 2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
 2021-09-02 13:23:16 +00:00