PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,820 Commits 1 Branch 0 Tags
011cdf6ef005da9c530d59791446c45e1adbc79c
Commit Graph

110820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
changbetty
29a32c0348 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours am: f8a47d0305 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4b0299779cccebd08d3484b9ea1ee50dba527f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:30:16 +00:00
changbetty
dcf39bd877 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours am: 92dfbb3f46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d5b52a87798eec16874f1ac749b42191c19ac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:30:11 +00:00
changbetty
e1f7628fd4 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours am: 6bf913c2cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48c5a23d135a7bbb3f551a89ba2168f6ff0f28be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:30:06 +00:00
changbetty
3b388643b0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours am: 2857cae239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec0e0e6e33005b8317a1883f874aaa4b4d30ee97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:01:00 +00:00
changbetty
f8a47d0305 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours am: 90b39af26d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04eb4cbc3c13ee58f22e562f8574f2d803eac304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:00:55 +00:00
changbetty
92dfbb3f46 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours am: fbaede66b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80e44ec17a6994e3e074d894b652a9d651c38c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:00:50 +00:00
changbetty
6bf913c2cf [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours am: cc4dea7377 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ecd2230b2581f3c1d08948be26ce9165dc999cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 05:00:45 +00:00
changbetty
114a948885 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours am: cf8be928f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8098b896f573c709c9bfa4bfcdd5d1a56aaf2615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:54:22 +00:00
changbetty
83beb1e088 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 am: dcbc894b01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I8d4550f29ee050499a5b3fe1c3ca98d9987435f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:54:17 +00:00
changbetty
2857cae239 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours am: 6244c65c24 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9ec3438440709224cd0d38a412936e286148f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:50:57 +00:00
changbetty
90b39af26d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours am: 0ddaaccbd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44d7c5f8834019f02a9b55b46ace4527c36d1d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:50:50 +00:00
changbetty
fbaede66b4 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours am: 5fc32464aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I726701dfe9fd97e6282a8c4b7239eb14051fb11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:50:42 +00:00
changbetty
6244c65c24 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours am: 3da973ce0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2b86041aeec56ba25871ae77b1225e86de40189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:21:14 +00:00
changbetty
0ddaaccbd0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours am: edc81984ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08c5a000495d30dafc6a65b836f1504e4196505f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:21:08 +00:00
changbetty
5fc32464aa [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 am: 36b97edab0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98cd0afdffc2e9afb5a6dd286d80534e8d327e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:21:00 +00:00
Yu
0aed038b0a Make p2p start searching after turning off airplane mode. 
In the P2P page, p2p stops searching when airplane mode is turned on, and should start searching when airplane mode is turned off.

Bug: 255249207
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest

Signed-off-by: Yu <zhangyu34@xiaomi.com>
Change-Id: I71d5eb6c3d8533417e8ae9ac09e7fac73983644e
 2022-11-16 12:19:23 +08:00
changbetty
cc4dea7377 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours am: 1cb32c446d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8916c1ff5fb21ea05638438be23211412f0ee856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 04:15:22 +00:00
changbetty
cf8be928f5 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours am: 094c3df0b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a46878127c8e808b5a3611497f766abf1226040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:49:37 +00:00
changbetty
dcbc894b01 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: cdbbd7bba4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419505

Change-Id: I1347a81821a65297dded3a093cbd0624ed454fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:49:33 +00:00
changbetty
3da973ce0f [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours am: f79bce9e6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2816ba5e027892be568d216b866da4bfa3c40b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:45:52 +00:00
changbetty
edc81984ac [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours am: 990c3d2a45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bdc7b00f0bc6c3e64c36d530a9baa331858d92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:45:47 +00:00
changbetty
36b97edab0 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: c55c060361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419567

Change-Id: I08ef257f759af3f9840eeee835399cc507d5dd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:45:42 +00:00
changbetty
1cb32c446d [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 31fb7bd480 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0665420077eb3c26cc373d449472dded08bda0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:45:08 +00:00
changbetty
f79bce9e6a [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 am: 8f412f14d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icef924bc46f0d32e40ec5a8e603a6b3ce6f6bd84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:41:20 +00:00
changbetty
990c3d2a45 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: fecf464fb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09f8da9647990cadb9b28f741f2f30e2d70ad783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:41:08 +00:00
changbetty
8f412f14d2 RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: 3cc8db3c58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419569

Change-Id: Ibb68644054e0b89f512a9540958a588a92194443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:39:36 +00:00
changbetty
094c3df0b0 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth switch not discoverable via SliceDeepLinkTrampoline am: e644704bee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae493b9336afdd1d87cdd4772fad8102f0f6c405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:39:32 +00:00
Betty Chang
f200134fc4 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev am: c8f6bba271 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410007

Change-Id: I5195b9513c575bc28f0b6930a6c40c570048f6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 03:10:44 +00:00
Betty Chang
c8f6bba271 Merge "Make bluetooth switch not discoverable via SliceDeepLinkTrampoline" into tm-qpr-dev 2022-11-16 02:28:08 +00:00
Joshua McCloskey
88e2f1e0e0 Ensure text doesnt jump during enrollment 
Test: Verified via fingerprint enrollment that dynamic text no longer
shifts the fingerprint icon view.
Fixes: 251235423

Change-Id: Ia70bb251af9df581e5c1e2b7dfcd9290dcc66b26
 2022-11-16 01:45:15 +00:00
Diya Bera
507fae7cbc Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev am: fe3305016a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20468119

Change-Id: I14371b5a594057c975079438075e7087df16f809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 01:24:40 +00:00
Adam Bookatz
632754a466 Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629

Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-16 01:23:04 +00:00
Diya Bera
fe3305016a Merge "Fixes loop in Fingerprint Enrollment" into tm-qpr-dev 2022-11-16 01:01:14 +00:00
Adam Bookatz
9703f6a154 Merge "Introduce concept of DockUser" into tm-qpr-dev 2022-11-16 00:59:41 +00:00
TreeHugger Robot
54170343cf Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev am: e2e892d46c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20454246

Change-Id: I3f6ad58e5f8292642d7eb958402d172537536d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 23:00:52 +00:00
TreeHugger Robot
e2e892d46c Merge "Add configuration for defaulting notification behavior" into tm-qpr-dev 2022-11-15 22:42:34 +00:00
Diya Bera
541185d383 Fixes loop in Fingerprint Enrollment 
Remove "Try again" in error dialog, since credential has timed out and
user needs to use pin/password/pattern before being able to enroll
fingerprint

Bug: 258307019
Test: Try to enroll fingerprint after 10 minutes of entering credential,
timeout dialog is shown with only one button to avoid looping

Change-Id: Ibb9a9e2095a1277fa01adc8eb5ce04af1b9ce495
 2022-11-15 18:22:36 +00:00
Hao Dong
f5ffb13dc1 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916

Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 16:04:49 +00:00
Hao Dong
8a0074e909 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev 2022-11-15 15:40:37 +00:00
sandeepjs
e69ab6cb77 [Android U][eSIM] Modify esim and sim card strings as part of esim primary 
As part of esim primary, esim and sim card related strings are changed for AndroidSettings project with reference from https://docs.google.com/spreadsheets/d/1RPVnNvmcjd-NSvPGg1jOi0mdC-sbCHvt9HVU4glV8fs/edit#gid=1716745126

Test: build
Bug: 257380320
Change-Id: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
Merged-In: I984d56e724dbd906e48358a31c6a7cb1e5db4fdf
 2022-11-15 11:11:50 +00:00
Sayak Dutta
e4445a6e86 Modify call to Header function of Glif Layout to disable autosize 
Bug: 245483008

Change-Id: I117e11f40764bf599bfa655755107342252ca891
 2022-11-15 08:24:30 +00:00
Treehugger Robot
486c74f4fa Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: Id1fe88f9af281f087c1291fa9645fab51ef9295d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 06:53:55 +00:00
Treehugger Robot
73c0f408a4 Merge "Update owner for Settings project" am: 20a3f8f9e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: I083eb43c64d81ebc75e33e0abf0fe8d063be1425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 06:22:14 +00:00
Treehugger Robot
20a3f8f9e8 Merge "Update owner for Settings project" 2022-11-15 05:43:00 +00:00
Joshua Mccloskey
945d614158 Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129

Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:51:14 +00:00
Joshua Mccloskey
8bc66cbb9f Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178

Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:50:46 +00:00
Joshua Mccloskey
0fb3dc390c Merge "Centered fingerprint icon" into tm-qpr-dev 2022-11-15 01:14:07 +00:00
Joshua Mccloskey
94ddcba809 Merge "Remove sidefps toggle from SUW." into tm-qpr-dev 2022-11-15 01:14:01 +00:00
Adam Bookatz
e5e232428d Introduce concept of DockUser 
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.

Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
 2022-11-14 19:19:21 +00:00
Grace Cheng
aa3465b842 Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I8b9b3ec232d2950b859f66c0ce547ea9ae9e3dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 19:06:02 +00:00