danielwbhuang
cf4be05b64
Update KeyboardLayoutPickerControllerTest
...
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png )
Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)
Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
2023-03-07 16:31:15 +08:00
Tom Hsu
39129e09d3
Merge "Add confirmation dialog for system locale change." into udc-dev
2023-03-07 03:31:02 +00:00
Julia Reynolds
a5cb399e33
[automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
am: 03d8116dec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: I48f619653dd7d9c93200c7dcff5167f3be4a032d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:15:54 +00:00
Valentin Iftime
940d0ca617
[automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
am: 573ee43d30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: Ibd3fa951f0536c29edf94fffd8b6ab9a4550041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:15:46 +00:00
Julia Reynolds
03d8116dec
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: Ibb5eb78a2a204c65e07b5d7aadb1192140d885fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:42:46 +00:00
Valentin Iftime
573ee43d30
[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803
Change-Id: I7720486012e67028bfa6887fa02078ad0094e00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:42:42 +00:00
Julia Reynolds
65a6e18fcb
Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev
2023-03-07 00:03:01 +00:00
Iavor-Valentin Iftime
47130733e3
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours am: 7a997113d1
-s ours am: 5cd3dc7d1d
-s ours am: 64ed6231d7
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: I17328bdff6629464c78592983be1792889192d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 21:38:22 +00:00
Iavor-Valentin Iftime
64ed6231d7
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours am: 7a997113d1
-s ours am: 5cd3dc7d1d
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: Ib2982a404593ddea6437f76c5eb62dce2370e70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 21:06:45 +00:00
Iavor-Valentin Iftime
5cd3dc7d1d
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours am: 7a997113d1
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: Iab2124de0eabd08b6ac97d3302b0ce06d627f138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 20:26:13 +00:00
Iavor-Valentin Iftime
7a997113d1
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours am: 89c9dc07df
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: Ie578f8dd5ff04a85cff54040d36cef9331e20f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 19:49:21 +00:00
Presubmit Automerger Backend
5e017cca99
[automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3
am: dbd4423d03
-s ours am: 3d35d4f195
-s ours am: d9561eccb6
-s ours am: ceb3161d14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578
Change-Id: I6adc360e67ee07d67c0c1bfd471b837892cbcfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:52:33 +00:00
Iavor-Valentin Iftime
89c9dc07df
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours am: 91ade78763
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: Icf801ae03384820cde40bf452e906720310b9c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:52:18 +00:00
Valentin Iftime
2e4ebc1759
[automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324
-s ours am: 34c63adf58
-s ours am: bc6fff715d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591506
Change-Id: I5aa077fd7d5ab41cd381f3c65e46512c94bc00d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:51:51 +00:00
Presubmit Automerger Backend
ceb3161d14
[automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3
am: dbd4423d03
-s ours am: 3d35d4f195
-s ours am: d9561eccb6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578
Change-Id: I5dc7783b274603e316e72f5a37d10f9ae6b17169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:19:17 +00:00
Valentin Iftime
bc6fff715d
[automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324
-s ours am: 34c63adf58
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591506
Change-Id: I6844c8000a7ff0fe12680686526d39eabb5be17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:18:46 +00:00
Iavor-Valentin Iftime
91ade78763
[automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
am: e116e63a91
-s ours
...
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: I5de53e483836d8324f70aba0ac3524ec0136e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 18:16:16 +00:00
Presubmit Automerger Backend
d9561eccb6
[automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3
am: dbd4423d03
-s ours am: 3d35d4f195
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578
Change-Id: I7a7a9cec98eef9a7fb4ac97b1d12ed4e60610953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 17:58:35 +00:00
Presubmit Automerger Backend
3d35d4f195
[automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3
am: dbd4423d03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578
Change-Id: I24706c16914df481703c844313d8d1bd340e0e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 17:43:48 +00:00
Iavor-Valentin Iftime
e116e63a91
Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639
Change-Id: I388da4ab1fed92f8afa92469e628f1324921df45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 17:40:55 +00:00
Valentin Iftime
34c63adf58
[automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591506
Change-Id: Idbb93322eaf2f581aa144e097922f2cd2df10884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 17:40:29 +00:00
Iavor-Valentin Iftime
450cacbee4
Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev
2023-03-06 17:06:11 +00:00
Marcelo Arteiro
b93f186df4
Merge "Automated Token Alignment Android/Material" into udc-dev
2023-03-06 12:46:02 +00:00
tom hsu
04eae5cc60
Add confirmation dialog for system locale change.
...
Bug: b/243511340
Test: atest passed.
Change-Id: I7ef4ed4557a1064d078e49a372f11a573b81058a
2023-03-06 16:01:27 +08:00
Daniel Huang
7f9eba9481
Merge "Set preference visible to false when there is no keyboard." into udc-dev
2023-03-06 07:26:57 +00:00
TreeHugger Robot
3e41d936b3
Merge "Fix icon touch dialog in Enrolling page" into udc-dev
2023-03-06 05:14:17 +00:00
ykhung
aae628ab64
Resolve IncompatibleChargerTipTest test fail
...
Bug: 246960554
Test: presubmit & manual
Change-Id: I4d1c481f90d55009255d7bdf6e822613831c9822
2023-03-05 10:10:40 +00:00
YK Hung
ba9bd128c7
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev
2023-03-05 05:17:32 +00:00
YK Hung
edb03e5535
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev
2023-03-05 05:12:27 +00:00
ykhung
ecb91b7d36
Update the incompatible banner tip icon based on UX refinement
...
Bug: 246960554
Test: presubmit & manual
Change-Id: I5fab570e1a8947d70a7923338c4e74caa67bcd2e
2023-03-05 11:30:19 +08:00
ykhung
3ae46cd6ec
Add a new config for checking BatteryManager show/hide rule
...
Bug: 271387663
Test: presubmit
Change-Id: If24b5e6de630afe972ad7ff7af866cb587db0a56
2023-03-05 10:54:01 +08:00
Wenhui Yang
87dca7b54e
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: Ide9d559a8cb50d90b637b2f56008f7f47b58d393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 06:30:03 +00:00
Wenhui Yang
9c3060dea8
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I6f155805d208da88c68df632023ee0c681d9e49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 06:29:54 +00:00
Wenhui Yang
ee77d819f9
Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I418f39b4328603ddd96a5d0a4cc1ed347ac70aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:08 +00:00
Wenhui Yang
59090cbb65
[DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I4222ff4118ab7e6da39cf777f676104092ac96b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:00 +00:00
Lucas Dupin
f9f6b80efc
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev
2023-03-03 18:45:22 +00:00
Wenhui Yang
1fc651aee7
Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev
2023-03-03 18:07:50 +00:00
SongFerng Wang
8153d6c491
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours
...
am skip reason: Merged-In I8092372372cb334b5ac1956b869d194b9fcd0523 with SHA-1 a9717482a7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: Ie4cbe406a891d0471517c34aa06d69815f8a5a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 17:57:27 +00:00
SongFerng Wang
d427c0d2d1
Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: I30a31add9ce0d6c8493edf162b57d80b03e4ef5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 17:15:07 +00:00
YK Hung
4f98350ba3
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev
2023-03-03 12:04:29 +00:00
danielwbhuang
1f3261467d
Set preference visible to false when there is no keyboard.
...
1. Physical keyboard settings should only show up if at least one PK is connected.
2. Update tests.
3. Fix NullPointerException.
Bug: 269983475
Bug: 270109384
Bug: 271357910
Test: atest and manual
Change-Id: If7798587fb386dbf669fc249cab304d91a26879b
2023-03-03 18:16:55 +08:00
Milton Wu
7b817dd0a0
Fix icon touch dialog in Enrolling page
...
1. Fix icon touch dialog not shown in Enrolling page for SFPS and RFPS
devices
2. Remove AccessibilityRepository and VibratorRepository because they
only bypass info w/o actual effect.
3. Add/Refine missing test cases for FingerprintRepositoryTest,
CredentailModelTest, AutoCredentialViewModelTest,
FingerprintEnrollEnrollingViewModelTest,
FingerprintEnrollFindSensorViewModelTest,
FingerprintEnrollIntroViewModelTest
Bug: 271535048
Bug: 271220339
Test: atest FingerprintEnrollmentActivityTest CredentialModelTest
FingerprintRepositoryTest AutoCredentialViewModelTest
FingerprintEnrollEnrollingViewModelTest
FingerprintEnrollFindSensorViewModelTest
FingerprintEnrollIntroViewModelTest
Test: Manually test enrollment
Change-Id: I7d1ed935e156bbd41d5da63902683e430fd3fc1f
2023-03-03 17:49:17 +08:00
ykhung
82d5103f07
Hide BatteryManagerPreference if there is no adaptive charging
...
Fix: 271387663
Test: presubmit
Change-Id: I12c511f17f23b21f6a584d86e854683fba037047
2023-03-03 17:46:27 +08:00
Angela Wang
5da8894d9a
Merge "Fix duplicated order in notification settings layout" into udc-dev
2023-03-03 08:56:49 +00:00
SongFerng Wang
2b3cbffffd
Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev
2023-03-03 07:42:51 +00:00
YK Hung
8efe31900c
Merge "Update the battery saver scheduler string" into udc-dev
2023-03-03 05:42:08 +00:00
ykhung
b25a824f50
Update the battery saver scheduler string
...
Fix: 266030870
Test: presubmit
Change-Id: I271f02b6a6044ba39d23e9ad1eb1decebe4eec85
2023-03-03 12:16:29 +08:00
YK Hung
ffd306e63a
Merge "Update incompatible charging string based on UXR suggestion" into udc-dev
2023-03-03 03:34:16 +00:00
TreeHugger Robot
4b4b0cf83b
Merge "Fix checkcolor_hook error" into udc-dev
2023-03-03 01:52:59 +00:00
Diya Bera
7cb164d0c1
[automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
am: f3012c6497
-s ours
...
am skip reason: Merged-In Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd with SHA-1 5faf4eeb8e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025
Change-Id: Ieed83b86abaedc2c6f49bc859ee3c51dde81763e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:37:20 +00:00