Valentin Iftime
193b56030e
[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: 2e4ebc1759
-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: I3ae12186a425eb7028d424888f9b1e730d7c742b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 19:46:29 +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
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
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
Marcelo Arteiro
22c4def463
Merge "Automated Token Alignment Android/Material" into udc-dev am: b93f186df4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21480745
Change-Id: Id7a102b1515ed4d3d20559743653d35eeb8aba86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 13:08:41 +00:00
Marcelo Arteiro
b93f186df4
Merge "Automated Token Alignment Android/Material" into udc-dev
2023-03-06 12:46:02 +00:00
Daniel Huang
c1f32370b4
Merge "Set preference visible to false when there is no keyboard." into udc-dev am: 7f9eba9481
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21572781
Change-Id: I238e5032372dc99d487b1f37a846cb7a54b113f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 08:03:11 +00: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
d74803d317
Merge "Fix icon touch dialog in Enrolling page" into udc-dev am: 3e41d936b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736488
Change-Id: I702df93da06e6b5038c06848973707bdce32a1d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 05:55:23 +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
f2b7f7afaa
Resolve IncompatibleChargerTipTest test fail am: aae628ab64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784768
Change-Id: I65a71d68d5690025bb7228af6a536756d0d8cabf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 12:39:02 +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
2691e0b2f3
Merge "Update the incompatible banner tip icon based on UX refinement" into udc-dev am: ba9bd128c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784767
Change-Id: I766cac77e8d4f70bf00208fc676f29595f9fe360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:48:36 +00:00
YK Hung
5c37ab9c6d
Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev am: edb03e5535
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784766
Change-Id: I1801f2db01ee7585a01f71dd879e900def56618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-05 05:28:03 +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
98ac7b2f33
[automerger skipped] Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
am: ee77d819f9
-s ours am: 87dca7b54e
-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: Ic14a8d09ca7a26e358352c7966d7270f9dee2e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:37:15 +00:00
Wenhui Yang
be0ccb8e01
[automerger skipped] [DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
am: 59090cbb65
-s ours am: 9c3060dea8
-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: I3948c110d3947130b9b86735c9771fa42b0697f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 07:37:09 +00: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
b81af50666
Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631
Change-Id: I032d15df9b5a4fd62d3fa40f1c8acb0b36cd2105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:21:34 +00:00
SongFerng Wang
2b26f1314f
[automerger skipped] Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
am: d427c0d2d1
-s ours am: 8153d6c491
-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: I0db8fbac952436a26b36d51aa1e8d4d3d10fa8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 18:56:43 +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
YK Hung
2300bbd5a8
Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487
Change-Id: Ice2abaa97f4d9b21e5d05c9d6a5c23bf6b7372a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 18:37:53 +00:00
Angela Wang
e49da0f0c6
Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804
Change-Id: Iea0c6c0116d008cbe33200ef8ecb546e96fb1d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 18:18:20 +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
YK Hung
04bc21c347
Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047
Change-Id: Id2d541bd387ae9736c1a74a4605d55286387f5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 17:44:48 +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
4759c9447f
Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046
Change-Id: Ic91d53898891a9140f4844e9567fba6c170acd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 16:59:47 +00:00
TreeHugger Robot
a8ab02ee7f
Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788
Change-Id: I2858864b51bc6b8e3f75b667c8f2e0be609bb4aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 16:57:08 +00:00
Diya Bera
4894495f06
[automerger skipped] Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
am: f3012c6497
-s ours am: 7cb164d0c1
-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: I98e087a4e69332a89e18ae1946c893c4d5f798ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 16:56:51 +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
Diya Bera
23ed65d348
[automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
am: afa29d5cb8
-s ours am: 63c145445b
-s ours
...
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: I85b3b28b9b3ed4bc7adc5ce1d8b2b5db92a09d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 02:22:01 +00:00
Chris Li
6cc9ace3d4
Update EmbeddingAspectRatio to the latest am: 81ee016a6e
am: 32d271dfb3
am: aabd2ee494
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464
Change-Id: If0108316abbd7f185002d821271d603b78cda7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 02:08:05 +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
Diya Bera
63c145445b
[automerger skipped] Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
am: afa29d5cb8
-s ours
...
am skip reason: Merged-In Iba4c13e8083ecb92f8033882af9147f14071e726 with SHA-1 7fa342fadb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: Ia1f47a216186d1819d70dfaa89af04a6e3341edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:37:05 +00:00