Commit Graph

121443 Commits

Author SHA1 Message Date
Marcelo Arteiro
b93f186df4 Merge "Automated Token Alignment Android/Material" into udc-dev 2023-03-06 12:46:02 +00:00
Daniel Huang
82a351dbae 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: Iac4669e64cdbbcecf76490742a6a0ce2c2300967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 08:03:03 +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
Patty Huang
ced8230ee9 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I779668d74a368ea4cc7c0c1e74ba528f16d6d68c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 06:30:15 +00:00
Ankita Vyas
c4ccf52658 Add config for display Cloned Apps page in Settings.
Bug: 266548680
Test: manual
Change-Id: I6a89813dd266591ef001f9fc4ef2fde9427818c0
2023-03-06 06:25:56 +00:00
TreeHugger Robot
8fa3ab329a 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: I273b1ccb553914c5bb21cdc8e99a1dcf493ee473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 05:55:18 +00:00
Patty Huang
0086b200d0 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: Ibb05089fd8a8245966e5ff9817e4a25833ccd442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 05:54:06 +00:00
TreeHugger Robot
3e41d936b3 Merge "Fix icon touch dialog in Enrolling page" into udc-dev 2023-03-06 05:14:17 +00:00
Patty Huang
5bb798f518 Merge "Add LE Audio allow list feature switcher in the developer option menu" 2023-03-06 05:14:07 +00:00
ykhung
921a2f45a0 Resolve IncompatibleChargerTipTest test fail am: aae628ab64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21784768

Change-Id: I4b79f54a99213ace69661413dfb67909867a0dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 12:38:58 +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
79e26c3228 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: Ib274c132a34a5399d6426dab5acfdb352f9e16d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 05:48:33 +00:00
YK Hung
e784c520f3 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: I519a2533bc1916741cd89f8d0cc9dc4b1d933f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-05 05:28:04 +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
Treehugger Robot
98a648d4f2 Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383

Change-Id: I4229a085aa2f088bbff7c6335d59b76c32a66283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 19:40:21 +00:00
Treehugger Robot
5e84729b10 Merge "Add getSubscriptionId API" am: 7813c4a9a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383

Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 19:10:17 +00:00
Treehugger Robot
7813c4a9a3 Merge "Add getSubscriptionId API" 2023-03-04 18:38:35 +00:00
Wenhui Yang
ad26c2873b [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: Ie97acfcf00275f997d5c51f74d85511096e30f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:33:18 +00:00
Wenhui Yang
c1d0064a70 [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: I5e808296d92c9c3e3132ccb646e754b7e9873aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:29:35 +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
Jack Yu
bc71ee5ece Add getSubscriptionId API
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.

Bug: 239607619
Test: Manual
Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2023-03-03 19:40:50 -08:00
Yu-Ting Tseng
631105a2af Remove CACHED_PROC_STATES which is unused.
Test: atest ProcessStatsTest
Bug: 271160990
Bug: 260242581
Change-Id: I62ed4eac102cc8f9c9ce7ab1325410cddc834ca1
2023-03-03 14:42:12 -08: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
2aff6c3484 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: I2a42a67681613992474c86cbf2e7744a67bf7a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:27:27 +00:00
SongFerng Wang
df1ed13f98 [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: Ia35941823a7904b4dae2d86dc07a4d7f40f03789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:25:25 +00:00
YK Hung
78be1d4dee 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: Ied630d92f743dc431e27dad52f47505615ddead8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:23:26 +00:00
Angela Wang
6d6652eeec 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: Ica3ac8f7ec7416baad3f10edbdb95f4c18085cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:20:06 +00:00
YK Hung
60ccbd9056 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: I1520ec312f75534c46927e126eb025a9fe9cda51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 19:04:14 +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
YK Hung
f95af758eb 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: Ice09e7200bbc0bff6fba713be8b38ea1fbb072b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:44:51 +00:00
TreeHugger Robot
88bcec84d8 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: I10124f01d59d9515f1c230efea1dc2f6dc7d0e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:32:30 +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
Diya Bera
69b0c4fe50 [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: I88b75092fa5fe59affcfb43b953a9ccf6d61535d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:12:25 +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