PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,386 Commits 1 Branch 0 Tags
a038241c96d15deb99ecd68b17faca3fb6fcbe2a
Commit Graph

121386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lucas Dupin
29ea690bef Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc am: b81af50666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631

Change-Id: I8062dfe5a83ddfc9abe47706a21449553eb6a71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 20:44:28 +00:00
SongFerng Wang
af10cf7e3e [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: 2b26f1314f -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: Idc52e986b3b739a97b15a8b349c71933376b3891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 20:41:54 +00:00
YK Hung
a4b6b43879 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3 am: 2300bbd5a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487

Change-Id: Ib0bfe810fbd19ab0abec75adda1a44a50b5f7617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 20:11:39 +00:00
Lucas Dupin
514aeeb058 Merge "Revert "Add discrete contrast UI slider in the setting"" into udc-dev am: f9f6b80efc am: 2aff6c3484 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21733631

Change-Id: I370ec766048281f8cf0cfc7fec3ed7dab51573d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 20:02:53 +00:00
SongFerng Wang
dc076c97f0 [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: df1ed13f98 -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: I94d567d0b519ea5305d4629a79c49b6efc809f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 20:00:50 +00:00
Angela Wang
c037a03d74 Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a am: e49da0f0c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804

Change-Id: I5f889e999d8fa15198120a541820f72a639a4bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 19:59:53 +00:00
YK Hung
d7b3234962 Merge "Hide BatteryManagerPreference if there is no adaptive charging" into udc-dev am: 4f98350ba3 am: 78be1d4dee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21736487

Change-Id: Ibffa6745725db3cca8d4005b0d3c1a5f842f5fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 19:59:42 +00:00
Angela Wang
592a2cb394 Merge "Fix duplicated order in notification settings layout" into udc-dev am: 5da8894d9a am: 6d6652eeec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578804

Change-Id: I16d6f03f01934deafc70298dd709e08bc7b0f117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 19:58:30 +00:00
YK Hung
a839516881 Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c am: 60ccbd9056 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047

Change-Id: If0451b0f13783dd7d361f2f574cbcb2a99f5b1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 19:47:06 +00:00
YK Hung
106ef93c1c Merge "Update the battery saver scheduler string" into udc-dev am: 8efe31900c am: 04bc21c347 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701047

Change-Id: Ic61b01af3ff9207598b3ee43cc4b23765717c888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 19:44:31 +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
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
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
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
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
YK Hung
34bc5c0382 Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a am: f95af758eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: Ia2d2a97e0f6af26436777b75859d451304f1ef69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:11:25 +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
TreeHugger Robot
e2ab55b69f Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b am: 88bcec84d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I051d352b0ebe5f45e9de17922daee786537e498d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 18:05:43 +00:00
Diya Bera
bc393400b4 [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: 69b0c4fe50 -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: I22b8cc9f2031597e536872eb1f93f7010bdb45bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:59:29 +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
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
YK Hung
f7d5e7b613 Merge "Update incompatible charging string based on UXR suggestion" into udc-dev am: ffd306e63a am: 4759c9447f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21701046

Change-Id: I34df51ffc34a30a0ec519b4d1dc8390cd888b600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:44:24 +00:00
TreeHugger Robot
62c1126aa0 Merge "Fix checkcolor_hook error" into udc-dev am: 4b4b0cf83b am: a8ab02ee7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21692788

Change-Id: I789ca4f985ef959a1cecb8760a2fe0053931a879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:35:52 +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
Diya Bera
3c26b3c6de [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: 4894495f06 -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: I3d6158e5878cb1a2d8e8a17bcea8acd48343fa0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:15: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
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
Diya Bera
aff74449ac [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: 23ed65d348 -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: Ifdbf6a282bb26deec4c64be3a5cf10a83d532dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:10:27 +00:00
Chris Li
64f32a3577 Update EmbeddingAspectRatio to the latest am: 81ee016a6e am: 32d271dfb3 am: aabd2ee494 am: 6cc9ace3d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464

Change-Id: I0780870cab370752b628b506c663528a7a53acd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-03 17:09:05 +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