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

85269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yomna Nasser
cf77b7a248 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev 2021-08-17 00:12:39 +00:00
Curtis Belmonte
dbef2415d3 [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
 2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings 
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
 2021-08-16 14:44:15 -07:00
Xin Li
42be0d2f75 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
Change-Id: I90fe22409ec7832714c8530f54408db747bdf3c4
 2021-08-14 06:30:57 +00:00
Android Build Coastguard Worker
17abee769d Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release 
Change-Id: I32876c55d01a88e477117fc7ebf87f196e3124a0
 2021-08-13 19:40:08 +00:00
Kevin Chyn
001fd1b1bd Do not show work profile strings for parent-managed enrollment 
Work profiles and parental management both utilize the
DevicePolicyManager KEYGUARD_DISABLE_* flags. This CL ensures that
work profile strings are only shown for work profiles, and not
parent-managed devices.

Bug: 196060286
Bug: 196443744
Test: Set up child account, then enroll from Settings > Security
Change-Id: Ib5ed1d63dd5d58ac64caf30010e340ac7784c38f
(cherry picked from commit 570540b15c)
 2021-08-13 19:40:00 +00:00
TreeHugger Robot
e51ac2563b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I681b191d4353cdbd88bf7da2b01afae2229b366b
 2021-08-13 19:31:54 +00:00
Bill Yi
c23385ba9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1743568b80aff5c6d89c328368f808ede831811c
 2021-08-13 19:31:46 +00:00
TreeHugger Robot
d3a02937ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
 2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
 2021-08-13 19:17:59 +00:00
TreeHugger Robot
87a7ebe1d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 19:08:56 +00:00
TreeHugger Robot
bd1e418efc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I793e523c10810844fb64372eb180a0e407781c77
 2021-08-13 18:55:56 +00:00
TreeHugger Robot
652c469f3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I815717369e7fc642b3180aaee3e88b496998ee9d
 2021-08-13 18:55:20 +00:00
TreeHugger Robot
612fb2cb80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38366b1c022b346a321b3f9b1d6206a750a4804a
 2021-08-13 18:55:15 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
afa6f208d0 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
255f31826f Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
TreeHugger Robot
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
TreeHugger Robot
3f6005944c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
TreeHugger Robot
e245bf8e66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93a887f210b6bbea351522f0d423664c25715871
 2021-08-13 18:21:24 +00:00
Bill Yi
e7eff15e83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ba31d3695cdea83bbdbc505fee4ccfab6fc9faf
 2021-08-13 18:21:09 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
 2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
 2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
Bill Yi
f13f8b9065 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 
Blank merge reason: commit message contains skip directive

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

Change-Id: I53d51fa42b4a0bd99c581205a438c09f75b24bf5
 2021-08-13 03:49:10 +00:00
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
 2021-08-13 03:48:58 +00:00
Bill Yi
f13d3514ec [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iee4e7722d362e9bde4b19e403cb5bdcdb84d5931
 2021-08-13 03:42:40 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
 2021-08-13 03:42:27 +00:00
Bill Yi
db32ad43da [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1716107ca1ede70291c80c65f838c80106296a80
 2021-08-13 03:33:05 +00:00
Bill Yi
d9ba125bb8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
 2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
 2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
 2021-08-13 03:24:52 +00:00
Bill Yi
ca003ac628 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b8e508353852d4626453b56e71f222ab40c7f6f
 2021-08-13 03:13:32 +00:00
Bill Yi
914383ee99 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia4a9c0e4621a7a13ac202564ae83d45a44a94517
 2021-08-13 03:08:13 +00:00
Joe Bolinger
74efeebf5c Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev am: c78af9a272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15520813

Change-Id: I28682e9fbbbb6c83b08ef45f10fd923d156c7742
 2021-08-13 01:14:44 +00:00
Joe Bolinger
c78af9a272 Merge "Refresh biometric preference controllers on lifecycle events." into sc-dev 2021-08-13 01:08:16 +00:00
Kevin Chyn
a92e3d9a03 Do not show work profile strings for parent-managed enrollment am: 570540b15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546128

Change-Id: I626b65d8db83f232ca4d173697dfb5d62e60d39d
 2021-08-13 00:59:39 +00:00
Joe Bolinger
2296f618cc Add biometric OWNERS to unit tests. 
Fix: 196452210
Test: N/A
Change-Id: I6f76bef97dd61130dd546749591338864665352b
 2021-08-12 16:17:03 -07:00
Kevin Chyn
570540b15c Do not show work profile strings for parent-managed enrollment 
Work profiles and parental management both utilize the
DevicePolicyManager KEYGUARD_DISABLE_* flags. This CL ensures that
work profile strings are only shown for work profiles, and not
parent-managed devices.

Bug: 196060286
Bug: 196443744
Test: Set up child account, then enroll from Settings > Security
Change-Id: Ib5ed1d63dd5d58ac64caf30010e340ac7784c38f
 2021-08-12 15:56:38 -07:00
Treehugger Robot
f5ddc8ffaa Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 am: 004f5168d4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: Ic41c5d666d0740dc8a6f4bdbb9e644ad981adee1
 2021-08-12 04:54:18 +00:00
Treehugger Robot
004f5168d4 Merge "Add owner to the connected device folder" am: 6cbb4dfbe1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371

Change-Id: I49a8ef27a0a7d45bd8e03666eee28db19fac2977
 2021-08-12 04:41:10 +00:00
Treehugger Robot
6cbb4dfbe1 Merge "Add owner to the connected device folder" 2021-08-12 04:23:29 +00:00
Hugh Chen
ddf63eac87 Add owner to the connected device folder 
Bug: 196287361
Test: local test
Change-Id: Ib800955f04bbd6c23b9a1700faa918f8b1126d79
 2021-08-12 11:16:18 +08:00
Kevin Chyn
26d1877a7b Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337af8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
 2021-08-12 01:10:01 +00:00
Android Build Coastguard Worker
78d69843df Snap for 7633965 from 4d8e7b1053 to sc-release 
Change-Id: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
 2021-08-12 01:08:52 +00:00
Kevin Chyn
715e337af8 Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll 
Bug: 196060286
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: Ib157dd916b1cfd2238cf6844a970d70cbf56faa6
 2021-08-11 16:35:35 -07:00
Bill Yi
a882d0fb25 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours am: 4d8e7b1053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c181cc60b8fc5aa80148e97de80d8af1939c8c4
 2021-08-11 01:52:50 +00:00
Bill Yi
4d8e7b1053 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5cc24b1fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecc762cad3adca3df40bd806c0cfb194ca519a9f
 2021-08-11 01:41:07 +00:00
Android Build Coastguard Worker
ce2a006fc9 Snap for 7629706 from bb0c70c0dd to sc-release 
Change-Id: Iab9bb91e46484faec3313937606643f51bb53f1e
 2021-08-11 01:09:09 +00:00