PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,581 Commits 1 Branch 0 Tags
dc8d7871d20e3b899a7ca100b51e4b7cce39d290
Commit Graph

125581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
dc8d7871d2 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 8de64b59bf am: d9e55a3781 am: efdf362faa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I738c5876dd063b9399b9f94b161a70284a8396fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 11:28:50 +00:00
Treehugger Robot
84a7dd6801 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 08482b1d2b am: ec98e814f1 am: f595b5b16c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I1a30e758cdba428754bd338185e8aaed85cc9dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 11:28:35 +00:00
Treehugger Robot
8d2f9d720a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 788a1ee2f6 -s ours am: 5a4638850f -s ours am: 10c7c7c39c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5922b764e57f93f9380f46871964a737d8fba89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:54:34 +00:00
Bill Yi
4352a4a662 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: 4d6f5e4db9 -s ours am: 14da53f6e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f2877287d1d5013226e7fa9171ed98574c41004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:54:25 +00:00
Daniel Huang
efdf362faa Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 8de64b59bf am: d9e55a3781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: Iae2a489403b70afe1845204367af24e2a7fffd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:12:32 +00:00
Treehugger Robot
f595b5b16c Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 08482b1d2b am: ec98e814f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I37a3df3fc52fff6e2682a122c60ac1ff98a42581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:11:00 +00:00
Treehugger Robot
10c7c7c39c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 788a1ee2f6 -s ours am: 5a4638850f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b711c57b6b8b0177d3c6741b5d734666dd0181b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:10:15 +00:00
Bill Yi
14da53f6e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: 4d6f5e4db9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f812197055577ba14ea21426c44520fe2d08908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 10:10:02 +00:00
Daniel Huang
d9e55a3781 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 8de64b59bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I4d5b52025a89b84a7970d1aa5e53a19f0afa1eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:50:10 +00:00
Treehugger Robot
ec98e814f1 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 08482b1d2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: If2e2b3a0737c065a883b3fb3e3f7b879277c715f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:50:03 +00:00
Daniel Huang
6ba9799131 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 6d36372c64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: Ie57f1366b838b84b2af46edaa023fe1973ab4e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:44:33 +00:00
Treehugger Robot
36e6a9d491 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 94d430b929 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: If83a923bf8b1b33ca724a894566e171270302e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:43:49 +00:00
Treehugger Robot
5a4638850f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 788a1ee2f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad4d1fa5bfe0de60eac2dfd499f992b6baff53ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:25:17 +00:00
Bill Yi
4d6f5e4db9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ad4b1df5dd2e4a1ba4d83a66b504ede5a2ac60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:25:02 +00:00
Chaohui Wang
9a29ef247a Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4 am: d5547fbcb1 am: be1469b9f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I630f2a9eca922a4186e8df1fc1525d2316d29607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:13:16 +00:00
Hao Dong
2c7d86e927 [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45 am: c811f94c92 am: e548bea2e1 -s ours 
am skip reason: Merged-In Iac9506d8430459aa399ac8efd3f41cbc6e67260d with SHA-1 6e8434b793 is already in history

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

Change-Id: Id290ebde9cf467ff857ba71f1f4d2c7b47c8f866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:06:44 +00:00
Chaohui Wang
be1469b9f6 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4 am: d5547fbcb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I520c33c0ceb8ab61a27def7f89e439b2a692cb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:04:11 +00:00
Daniel Huang
8de64b59bf Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: If96482ee38a1e3956ec1d936e555846ff66f2aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:38 +00:00
Treehugger Robot
08482b1d2b Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I2cc06f818546475cb1951b0e02f44f9bf4add503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:24 +00:00
Daniel Huang
6d36372c64 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: Ibfe49eb8a48c8e892c31bff5846a539e955807b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:06 +00:00
Hao Dong
e548bea2e1 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45 am: c811f94c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I9427005098ab0ce645f7432f07dc3fab2352dcce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:03:04 +00:00
Treehugger Robot
94d430b929 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I08a599d0a917a57f8f3bf8e72363664495f6395e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 09:02:28 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
Treehugger Robot
788a1ee2f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I180520a7cbb04c5978af4a22203b969f1d81a18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:50 +00:00
Bill Yi
df0a1a06a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia765c4911206c444c00562b7d7220317780adec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:56:41 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues 
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
 2023-05-04 08:56:41 +00:00
SongFerng Wang
eb7b7ff2b1 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 am: 45512c8b0c am: 6cfb908ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I26df04ca46607752f791181cb1ccac376018818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:54:55 +00:00
Treehugger Robot
8d14c5bf53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours am: b5933a3dac -s ours am: d1b9b5262a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7bff0709e0cc111f1d5e6755cfae2479fdb3798e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:33:19 +00:00
Treehugger Robot
54de6fd80b Merge "Support incompatible charger state in the battery main page" into udc-dev 2023-05-04 08:28:57 +00:00
Chaohui Wang
d5547fbcb1 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I23bd63427d47a63b51ad7eee58fcb963285ee3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:24:06 +00:00
Hao Dong
c811f94c92 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: Ic0348cedcd122cbbc0e4715feb4f9e7f2b569c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:23:48 +00:00
Chaohui Wang
0b387d23c2 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: f029f96558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: If11c36598e70dcbc93d41857adbb328dc0968b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:18:31 +00:00
Hao Dong
565a6ece6d [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 55379a00aa -s ours 
am skip reason: Merged-In Iac9506d8430459aa399ac8efd3f41cbc6e67260d with SHA-1 cb00672359 is already in history

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

Change-Id: I4535015e99cd5e2da5a850bbed5dde283277a03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:18:22 +00:00
Treehugger Robot
6abfad6bfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours am: 1a01a70537 -s ours am: 3938ef6ebe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieedc52f20149c0e08bc785141e384aae2243caca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:06:10 +00:00
Bill Yi
21e615727e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours am: 2e1b23c580 -s ours am: 80859fe3dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ed3fc1fdd1f8a78d66b6a433c8ae76197ec341f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:05:41 +00:00
Treehugger Robot
e9662fe6d7 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024 am: 5e8bd15267 am: 7f70daf730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I8cecad2c55bb040b2ffc573f30140d34749f563e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:56 +00:00
Tom Hsu
14e213bba8 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add am: 964ce5a785 am: 4c96e3e3dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Id35fbee6fae56a4cff89f0dfa3a32131d8b0c69e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:46 +00:00
Tom Hsu
fe739ccfbe Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 7bd9a86731 am: c34e52c633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Ibd02d0fc11ec0e1e8b9ed932871636126332ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:36 +00:00
Tom Hsu
5610bda058 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 692d0a45ef am: 88e72070de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I8a3cbf517e77bc5fc8bef16688eba310084f73d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:27 +00:00
TreeHugger Robot
76ddf64e1b Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: 700e460908 am: 40a5a6b6ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I2ea7c2c998b0a2f28fa427a89d1db2ec6676fe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:18 +00:00
TreeHugger Robot
f3f4e4de2b Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: b4d3bd6859 am: 6324ac704d am: 068f4194e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I74f2a1a914de185a8d2351421f432f377c185927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:09 +00:00
Treehugger Robot
3de5f48bd2 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc am: f4c61c812a am: 965c66b2c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I263be5b51c9e58d4345057de5215ebd71c62dc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:03:58 +00:00
SongFerng Wang
6cfb908ca5 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 am: 45512c8b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I10d8c830dd0b41b39f1d98d3379c28b537f3d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:57:24 +00:00
Chaohui Wang
396b3b45d4 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I7c302932f91793a9ab80796e4e6448c99bfd39e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:56:51 +00:00
Treehugger Robot
74b2aac7b5 Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp am: 14cdc33fb7 am: 05450878ef am: 58b332455d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I44dca7288fdf44ce414332c1c439a523009d75ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:43:21 +00:00
Bill Yi
82aa89fe0f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff 2p: 98c8d85c26 am: 56b01ab110 -s ours am: cb37799525 -s ours am: 3c6cbf53d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia72eaa65f8fcb0e19aac72c38e9ab6c0b0e3ff93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:42:46 +00:00
Chaohui Wang
f029f96558 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I93cd903136cff94b75348c0d8a0ada523f38bca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:27 +00:00
Hao Dong
55379a00aa Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I7dccee436e7050ed5a97387b97b1adcb3df228d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:05 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +00:00
Hao Dong
56f39eeb45 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I477cd05789ff62ad6cba68908de99d426d227e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:37:04 +00:00