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

85396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
c6f7519a06 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb4b4bca0e34eab569c4dffe0b76ecf6e2dd23d5
 2021-09-02 13:15:34 +00:00
Bill Yi
c71f1a2fce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib76b04af514d6c2179f8f56a4e1ef47885e595cc
 2021-09-02 13:11:52 +00:00
Bill Yi
a40d069943 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf88966cf8bb8b3e291684292774d782320208dc
 2021-09-02 13:08:25 +00:00
Bill Yi
4f514d351e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I964e86741a41b4135f26b107e2ce0cbe713a463d
 2021-09-02 13:06:49 +00:00
Joe Bolinger
225b53ef68 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: I96fb7c18fb9c1cd21f4a8682c4f07b838bfcb91d
 2021-09-01 01:25:57 +00:00
Joe Bolinger
c7a0b63dd9 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev 2021-09-01 01:15:40 +00:00
ykhung
4e3f692164 Hide Camera background running time in the battery usage screen 
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
 2021-08-31 13:58:13 +00:00
Bill Yi
b53d0089cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31208c4948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9da0107bd11e76ba1e158b1fa48b5b04a007a042
 2021-08-29 20:28:13 +00:00
Bill Yi
cc19de6420 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5d0f92e0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7b0ce43ba4601703df172dcb9113e364678484b
 2021-08-29 20:27:03 +00:00
Bill Yi
31208c4948 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:43 +00:00
Bill Yi
fa54b86b5a Merge changes from topic "presubmit-am-97a471bd986844e18bd548ced9fef8c8" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:43 +00:00
Bill Yi
a5d0f92e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-29 20:09:03 +00:00
Bill Yi
301c3365ac Merge changes from topic "presubmit-am-c20da0f0065e4b1f830af72ee7464b84" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-29 20:09:03 +00:00
Bill Yi
85a9e657e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:08:34 +00:00
Bill Yi
2d6a17b989 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-29 20:04:40 +00:00