Bill Yi
aa006392a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 364eb998be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788719
Change-Id: If37e1601cb241afb5cdcba0673da2576acdeb7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 23:23:16 +00:00
Bill Yi
a35176545a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2abc0ab7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789283
Change-Id: I4dacd8d123551565d05bcdb7444b33051e1a74ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 23:19:35 +00:00
Treehugger Robot
fff50202bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 3c796f10fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789284
Change-Id: Ic4881f194a8ebc127466defb6479d49458a964fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 22:56:20 +00:00
Bill Yi
2736439ffe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28cf36e37d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23789284
Change-Id: I88f14792e729f8f300898c23568efb1fb22e79a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 22:56:14 +00:00
Bill Yi
80076b90b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d772bd36b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23788722
Change-Id: Ibff85baa33e755635d00211a2c18d2d570f0793c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 22:55:50 +00:00
Treehugger Robot
3c796f10fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-23 22:24:59 +00:00
Hao Dong
a7af958f4c
Merge "Fix pattern rotation header text." into udc-qpr-dev
2023-06-23 17:57:12 +00:00
Bill Yi
c9ef01aae5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If5084da2a965a60877df3388703adaa94792712e
2023-06-23 06:45:01 -07:00
Bill Yi
6a2d395a4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I33f9c6778e44fe0b391dac3a134aab87aec5815c
2023-06-23 06:35:05 -07:00
Bill Yi
28cf36e37d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0fe5b71d7ef1901d3b7238e0cd8db2fcafaffda7
2023-06-22 22:09:39 -07:00
Bill Yi
e2abc0ab7a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia036b42598639dac49342562f238cb378b3f6091
2023-06-22 22:06:04 -07:00
Bill Yi
d772bd36b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22bbb5c016e705cbc07f4824acd0d33f9e094e98
2023-06-22 22:04:11 -07:00
Bill Yi
374a3112e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4477e0289b2b1cc331320e550cef7f74ec2af74e
2023-06-22 22:02:27 -07:00
Bill Yi
364eb998be
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9aa9cc04f3cff9f455ced6d6fe8b384c4954b21f
2023-06-22 21:57:59 -07:00
Hao Dong
35ebdefcd8
Fix pattern rotation header text.
...
Bug: 278055194
Test: atest ChooseLockPatternTest
Change-Id: I36ec325b46d7a7f583d94dc26f9962cadc3874cd
2023-06-23 02:37:22 +00:00
Hao Dong
800728a5a6
Merge "Fix require on screen toggle on guest user." into udc-qpr-dev
2023-06-23 02:36:48 +00:00
Bill Yi
df60aeda89
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341
-s ours am: d2fa0c27de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781176
Change-Id: I94edf14e689094253de4006030f3a490663445ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:52:55 +00:00
Hao Dong
02f72c16ae
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213
Change-Id: I97978a19733bc19904bd7fb72d80955e1f400d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:52:35 +00:00
Hao Dong
c9a99978f9
Fix require on screen toggle on guest user.
...
Bug: 286018876
Test: atest FingerprintSettingsFragmentTest
Change-Id: I432ffd3b8b32caeaf7ac8c6bc3c2ee2a0ee53a08
2023-06-23 00:32:32 +00:00
Bill Yi
d2fa0c27de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23781176
Change-Id: I452f11e910b1b1c99ed2d8cd06c5915f6df6d1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-23 00:07:11 +00:00
Hao Dong
0f63a450a8
Merge "Fix delete face button disappear after reenroll" into udc-d1-dev
2023-06-22 23:58:55 +00:00
Bill Yi
24a7a54341
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
2023-06-22 10:35:13 -07:00
Vania Januar
a425247076
Clarify that enabling Notes role requires reboot in preference summary
...
Bug: 288387225
Change-Id: Id07e3b188442c6f4695b43d62b02ea8465d76a7e
Test: only a string change
2023-06-22 10:12:30 +00:00
TreeHugger Robot
b30f4fb6ae
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5
-s ours am: 2461b42f22
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: I7dbcdb83d522d22d65742860691e66c762248a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:54:22 +00:00
Bill Yi
b6e9b3a532
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2
-s ours am: b9ebaae7af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: I90cd7323c3ec83db0a924b0014159042feb7e0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:54:05 +00:00
Bill Yi
bf69a5d059
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a
-s ours am: a0c53d9c73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773144
Change-Id: I7234ec198e05f527fae10590cea6c66b4754f250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:53:53 +00:00
TreeHugger Robot
2461b42f22
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: Ib99ea17012fbce64cda4b657b89941680fe34127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:11:33 +00:00
Bill Yi
b9ebaae7af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773145
Change-Id: I365f1efdc1ea9a7cb8affb6aecb77dd497eecd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:11:21 +00:00
Bill Yi
a0c53d9c73
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23773144
Change-Id: Ic8c35b629548b57cf3363f2bd9a04611601af76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:11:00 +00:00
TreeHugger Robot
3f85afaad5
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-22 07:13:52 +00:00
Bill Yi
65122fc3d2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaff205a3b097d4239074e483525f0ab12f97d493
2023-06-21 16:33:47 -07:00
Bill Yi
588001801a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
2023-06-21 16:32:09 -07:00
Bill Yi
9edf806ba6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44
-s ours am: 41ce899068
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I70888ee81d9f732e36e26d9973fd41d9b333ad24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:21 +00:00
Bill Yi
1ab65c1eee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec
-s ours am: 1e96e76303
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If91d2debcd0473118ad961acd596c9416429ff24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:11 +00:00
Bill Yi
afe4c272b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a
-s ours am: ea4210eaa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I53f8cd2cbfde565db968258fb19252868068cfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:07 +00:00
Bill Yi
41ce899068
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I8c48ccb9155ac97fb569e13504dcd262970df059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:26 +00:00
Bill Yi
1e96e76303
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If55db97addae5d0c38c1434b0b26229bc28a2f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:21 +00:00
Bill Yi
ea4210eaa2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I0964084a146f7a227407ba55eaae3c280a7140cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:10 +00:00
Bill Yi
bfde831c44
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 19:19:29 +00:00
Hao Dong
bf84218753
Fix delete face button disappear after reenroll
...
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446
Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
2023-06-21 18:45:40 +00:00
Matías Hernández
027f0a46ae
Settings: don't try to allow NLSes with too-long component names
...
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).
Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-21 17:02:32 +02:00
Bill Yi
6072ca10ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Chaohui Wang
88fd45b1e6
Fix ANR in TelephonyStatusControlSession
...
Feature.get() blocks on the main thread, which cause the ANR.
Cancel the job instead to fix.
Fix: 287702163
Test: Manually with MobileNetworkSettings
Test: atest TelephonyStatusControlSessionTest
Change-Id: Id873e56359dbf198c31686c2280c979294c95c3d
2023-06-21 16:43:17 +08:00
Treehugger Robot
fa2f6edc55
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438
-s ours am: 3a3d7e41a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I3d357610f0a41ff7edc1e8ef567c5240662df040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:51 +00:00
Bill Yi
450076d57b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8
-s ours am: ed188e243f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I90244747007a95bab7e6ccf62978b8f5a6378919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:38 +00:00
Bill Yi
d35f04d453
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684
-s ours am: 5499c23607
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: I416fd31a3dd136ff958eab36b738d370e582a483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:53:23 +00:00
Treehugger Robot
3a3d7e41a3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I913ac0acef2a70a9e3619e380e8dcca3764451c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:23 +00:00
Bill Yi
ed188e243f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I06a42857f8ef4d119b5f0fc00a3a2b33e02ce715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:37:18 +00:00
Bill Yi
5499c23607
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ida4fe997bc0b5c67ee638d5ae40ef97d4d9e4428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 06:36:53 +00:00