Automerger Merge Worker
511c72a858
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours" into udc-qpr-dev-plus-aosp
2023-08-09 20:23:54 +00:00
Bill Yi
7cf9c48bae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Idaf3e9b4651f4a084b2b485fd4473b334a39fd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:48 +00:00
Bill Yi
a504e18149
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 9652e9c719
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I647a12e7e1346238ea666d6e1c573cb8490f1c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:39 +00:00
Bill Yi
a21b81f077
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 6672750bc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I66fe9ee2e5c45c39272ca441336a9d3754a6704c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:25 +00:00
Bill Yi
38a0dbf56e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I35f0cefb18df5b77e3b80df34237c6aef76e2570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:54 +00:00
Bill Yi
9652e9c719
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I40d2c7cccabc1cf17c329ae6ab56c3a47ba0dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:53 +00:00
Bill Yi
c16fbeba8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: e386a40c7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I008bfa308aafa971e99f2bb5ad5f135b64683b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:40 +00:00
Bill Yi
6672750bc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I1dff64c0aa9aba357dc489d82ffce984d7e861b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:02 +00:00
Bill Yi
e386a40c7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I561989da97fbb01dab1526f1a155d4fe8f19f6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:57:12 +00:00
Bill Yi
6cb3c567da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Id21824686a3e59ad6ee5bb57b5ff33f30b5e5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:56:54 +00:00
Bill Yi
5ba6d8c939
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I359371221dc01d908c2acae69c2665acdf6d060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:52:49 +00:00
Achim Thesmann
afbc3a4929
Allow BAL from PrintServiceSettingsFragment
...
This fixes the info button on the printer in the printer list (the call
is from the system (uid=1000) and needs to allow BAL to start the
activity).
This only opts in sending a single pending intent to the previous (pre U) behavior which allows BAL. Therefore the risk of the change is minimal. This was reported by an external partner.
Bug: 277761614
Test: manual test & presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdb87fe235887460081ed396cf6ab902f1971b5d )
Merged-In: I35715e948b9166c42372b7d40a30a7102018a148
Change-Id: I35715e948b9166c42372b7d40a30a7102018a148
2023-08-09 18:15:04 +00:00
Treehugger Robot
8634789d95
Merge "Split the string resource id for non-generic accessibility preference." into main
2023-08-09 17:58:35 +00:00
Evan Chen
e10fbc9af9
Merge "Add tag for associationInfo" into main
2023-08-09 17:25:37 +00:00
Bill Yi
735a75da63
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
BUG:291030186
Change-Id: Ibf93c473acbb5f6060ec039a8a1b5ec824d638f6
2023-08-09 17:24:49 +00:00
Chun-Ku Lin
364178428a
Merge "Remove unused variable" into main
2023-08-09 17:08:17 +00:00
Andreas Miko
a7d7eb9a16
Change nullability of inheriting function of PinPrivacyPreferenceController
...
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
2023-08-09 16:35:09 +00:00
Milton Wu
b1ad3fa01b
[BiometricsV2] Fix end-to-end enroll test fail
...
Fix end-to-end enrollment test fail because of using incorrect observer
type to observe finish page data
Bug: 295140687
Test: atest biometrics-enrollment-test
Change-Id: I9ca8d1c6383c2ecf3f94dc1e5cbb878e4328a900
2023-08-09 23:27:57 +08:00
Vania Januar
7dd94771bc
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
am: 2afb275e09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I943ad68a44de16de1899ad4a613c2c221c698f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 15:13:35 +00:00
Vania Januar
2afb275e09
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I1969dedbd9327fc6ab4dfa0715192b3f882a4e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 14:32:18 +00:00
Vania Januar
2d77f72cb6
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev
2023-08-09 13:50:06 +00:00
Graciela Wissen Putri
5b97e3ecda
[5/n] Add graphics to app aspect ratio options
...
Static assets in Apps > App Info > Advanced > Aspect ratio
Animation in Apps > Aspect ratio
Bug: 293138315
Test: Manual
Change-Id: Ia0d5e9ab3435b395284701a2d915c9cb454593c0
2023-08-09 13:33:06 +00:00
Treehugger Robot
9ba8b79061
Merge "[BiometricsV2] Fix end-to-end enroll test fail" into main
2023-08-09 12:59:13 +00:00
Treehugger Robot
80d3ac14a6
Merge "Fix R.string.search_menu" into main
2023-08-09 12:54:28 +00:00
Elliot Sisteron
cbc619c870
Respond with null data when no biometrics.
...
Safety Center expects a response to the broadcast in this case.
The Settings app should respond with explicitely no data to Safety
Center rather than not respond.
Bug: 295143688
Test: atest BiometricsSafetySourceTest
Change-Id: Iea7f7c53919d90bf3d7fd989fb2f320a5c9ee9c6
2023-08-09 12:46:28 +00:00
Felix Stern
76707864e5
Merge "Adjusted Settings to use updated internal InputMethodManager methods" into main
2023-08-09 12:36:41 +00:00
Chaohui Wang
781ca69f9b
Fix R.string.search_menu
...
It's belong to namespace com.android.settingslib.search instead of
com.android.settingslib.widget
Fix: 295106566
Test: manual - on Developer Option page
Change-Id: I6f66509ebc89094f96e08860c2d034b3b22c3b50
2023-08-09 20:04:48 +08:00
Milton Wu
181538084d
[BiometricsV2] Fix end-to-end enroll test fail
...
Fix end-to-end enrollment test fail because of using incorrect observer
type to observe data
Bug: 295140687
Test: atest biometrics-enrollment-test
Change-Id: Idfb95400c1462dac5a44731f46f67b22be93e0a6
2023-08-09 19:33:56 +08:00
Allen Su
9e696767e4
Keep the dialog when touching outside the window
...
Bug: b/292189991
Test: by manual
Change-Id: I2df1a62956e1c43cccdf58478462b964ea3e49fe
2023-08-09 11:16:28 +00:00
Vania Januar
558d9f8750
Add the USB device parameter to usb stylus feature preference provider.
...
Test: StylusUsbFirmwareControllerTest
Bug: 291922092
Change-Id: Ie43bceb807e18ff56d01f6e99316db6e2820383b
2023-08-09 11:06:23 +00:00
Chaohui Wang
b0b710f1b0
Clean up @OptIn(ExperimentalCoroutinesApi::class)
...
After runTest get stable.
Bug: 285231003
Test: unit test
Change-Id: I200ba979727b900380b107bd82e1d0e43ab1d994
2023-08-09 17:26:10 +08:00
Treehugger Robot
33d480ed56
Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main
2023-08-09 08:37:45 +00:00
SongFerng Wang
e22ab2c94b
Merge "Fix NullPointerException of LocalMediaManager" into main
2023-08-09 07:19:38 +00:00
Milton Wu
f8cdda45aa
[BiometricsV2] Refactor AutoCredentialViewModel
...
Fix previous review comments on
I84bab0b46e023303c0046a6ae6886ab1cf9458b8
Bug: 286197659
Test: atest AutoCredentialViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I9b43a637439e941bdb884e3ae2f656d573364123
2023-08-09 06:39:48 +00:00
Eric Biggers
6cb2d5a795
ChooseLockPattern: remove redundant setting of visible pattern default
...
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136). The explicit defaulting to true was only needed
before because the low-level default value was wrong.
Bug: 270013005
Test: Set a pattern. Verified that Keyguard uses visible pattern.
Disabled the "Make pattern visible" option in Settings. Verified
that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086
)
2023-08-09 04:03:18 +00:00
Eric Biggers
08e6612a3d
Stop calling LockPatternUtils.setVisiblePasswordEnabled()
...
Since the removal of support for Full Disk Encryption (FDE) in favor of
File Based Encryption (FBE), this method has been a no-op.
Bug: 208476087
Test: atest ShowPasswordPreferenceControllerTest. Note,
isAvailable_whenNotVisible_isFalse fails both before and after.
Change-Id: Ifb8fc93757366240cf37e4b9a600c2034302919e
Merged-In: Ifb8fc93757366240cf37e4b9a600c2034302919e
(cherry picked from commit bcee8ce1af
)
2023-08-09 04:02:54 +00:00
Treehugger Robot
2200654a7b
Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05
am: b5195183cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353
Change-Id: Ie9c54fddcb4344051fc492a23bf7102214f10b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 03:29:46 +00:00
Treehugger Robot
b5195183cc
Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353
Change-Id: I00faa95548e4fba8d1a0618b0064080a609b6f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 02:46:35 +00:00
Treehugger Robot
611e43fe05
Merge "Fix crash after confirmLock" into udc-qpr-dev
2023-08-09 02:10:49 +00:00
Eric Biggers
eeba25e2f3
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 4471257a0b
-s ours am: 6cc1240b9d
-s ours am: af0ddcf8e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Ia0200da1d6ac0c0831b21881b8613862407981b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:51:02 +00:00
Eric Biggers
7cb838d352
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours am: 6ad8bea7c9
-s ours am: 618272911a
-s ours am: 179b563079
-s ours am: ea68785152
-s ours am: 95ee7cd219
-s ours am: 6a369e6269
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Icd483a8b7c4a79679ca62de4c0b33f2f3271d184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:50:50 +00:00
Eric Biggers
d8bc5be191
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 02bbe6b4a5
-s ours am: de352f9e1e
-s ours am: 2459ed07d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Ifbfb2e5cf63dfb64b70037f2450eceafe0d4d927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:50:38 +00:00
Automerger Merge Worker
6c61ae4f2a
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours am: 67c4be1e52
-s ours am: 57c5a92514
-s ours am: 3a9f8d7b32
-s ours am: c598a4cf48
-s ours am: 92939c1eb3
-s ours am: 64f3b181ab
-s ours am: 503317bba1
-s ours" into udc-d1-dev-plus-aosp am: 01567c311e
-s ours am: 26435d8f56
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I6048f402a3e61facc184c0615754286c3664297e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:50:19 +00:00
Eric Biggers
e3b3f05782
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours am: 67c4be1e52
-s ours am: 57c5a92514
-s ours am: 3a9f8d7b32
-s ours am: c598a4cf48
-s ours am: 92939c1eb3
-s ours am: 64f3b181ab
-s ours am: 503317bba1
-s ours am: 984e4fc571
-s ours am: 88361d7657
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I5589376b8603c123eb73d9bec888e45ef18394fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:50:13 +00:00
Eric Biggers
af0ddcf8e6
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 4471257a0b
-s ours am: 6cc1240b9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I06f9cd874393b2bb275db1f533bbcfa7fd86f643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:09:02 +00:00
Eric Biggers
6a369e6269
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours am: 6ad8bea7c9
-s ours am: 618272911a
-s ours am: 179b563079
-s ours am: ea68785152
-s ours am: 95ee7cd219
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: Id30304f21a54310427ec15bb64d08a17b0eb597d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:06:37 +00:00
Eric Biggers
2459ed07d1
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours am: 80ef1e0ff5
-s ours am: 7f97ac5ea7
-s ours am: 4643015447
-s ours am: f050fc11ca
-s ours am: a78f35b23d
-s ours am: 1679e7f685
-s ours am: 02bbe6b4a5
-s ours am: de352f9e1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I33890fbb26e154621c7a51d6b92d95662a9de66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:05:05 +00:00
Automerger Merge Worker
26435d8f56
Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours am: 67c4be1e52
-s ours am: 57c5a92514
-s ours am: 3a9f8d7b32
-s ours am: c598a4cf48
-s ours am: 92939c1eb3
-s ours am: 64f3b181ab
-s ours am: 503317bba1
-s ours" into udc-d1-dev-plus-aosp am: 01567c311e
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 8f3ca8daeb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Id66ed318123977e68eb1d56c85a342bb24d84d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:04:14 +00:00
Eric Biggers
88361d7657
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours am: 67c4be1e52
-s ours am: 57c5a92514
-s ours am: 3a9f8d7b32
-s ours am: c598a4cf48
-s ours am: 92939c1eb3
-s ours am: 64f3b181ab
-s ours am: 503317bba1
-s ours am: 984e4fc571
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: Ic25b4aa9b9b71157583ed862021c031a89c061cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 23:04:09 +00:00
Anvesh Renikindi
d811e2b515
Merge "Remove ExperimentalLifecycleComposeApi" into main
2023-08-08 20:33:33 +00:00