Commit Graph

122941 Commits

Author SHA1 Message Date
Lucas Silva
86231b9ec5 Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698

Change-Id: I6bef5d5f5c4730c8832436b03242315aa4098f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:48:46 +00:00
Lucas Silva
d66bde103a Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev 2023-05-04 15:37:25 +00:00
TreeHugger Robot
1765b7d866 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I2f1bdfb9c562ecc3809376e1dfa471388cb5451a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:27:32 +00:00
TreeHugger Robot
76edddc1c5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321

Change-Id: I97766d9ecac3a7de66d7d1b66a95264c14049a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:23:05 +00:00
TreeHugger Robot
3a2b8e81e5 Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev 2023-05-04 14:57:36 +00:00
Vania Januar
fb7c1766a8 Replace placeholder icons with stylus icons
Bug: 250909304
Test: manual
Change-Id: I738a262ea0e3f03408c892adb758b99dd6d47386
2023-05-04 11:24:39 +00:00
Chaohui Wang
eac485f661 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: e9540185f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I48ca3f2af4dfcb3db4b998b94cc0232048ecd265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:10:53 +00:00
Chaohui Wang
dd3458d125 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: 77d967d713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I308e86901dd8c4351287446b7253ddffb1f3a3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:31:20 +00:00
Chaohui Wang
e9540185f1 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I49f8c6cd6294cfb44d176f4dd79e7b4b8804b0ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:30:46 +00:00
Chaohui Wang
77d967d713 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: I45f674b17b68eee4c3c7246eaf5d11c80666f48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:59:12 +00:00
Daniel Huang
80155a1f9f Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: da19d4a244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I4226404e458e9f45aee3bcae3dacfd3228077ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:59:01 +00:00
Treehugger Robot
c78f69ccbd Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: c1607192c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I8c7674799e4dbf46957699cba13d27b058c686e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:55:41 +00:00
Chaohui Wang
a00cd955c9 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: d18cfc2bdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I682be4c202a06cc81bb32796e88315e391091750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:55:04 +00:00
Hao Dong
0e69c0bb68 [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 6e48b99a85 -s ours
am skip reason: Merged-In Iac9506d8430459aa399ac8efd3f41cbc6e67260d with SHA-1 6e8434b793 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I44e76f43525aac66fec5f27ed432c71dad61be0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:54:19 +00:00
SongFerng Wang
0cac65eb1f Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: be40af59d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I23b89b8c1b0665ccb7a26d6f3d167636c543bf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:53:39 +00:00
Daniel Huang
d9e55a3781 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: 8de64b59bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I4d5b52025a89b84a7970d1aa5e53a19f0afa1eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:50:10 +00:00
Treehugger Robot
ec98e814f1 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b am: 08482b1d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: If2e2b3a0737c065a883b3fb3e3f7b879277c715f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:50:03 +00:00
Chaohui Wang
3f4820bdf1 Merge "Update for getSystemPackageNames" into udc-dev 2023-05-04 09:43:28 +00:00
Daniel Huang
da19d4a244 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: I6bcdd801f50041a36f20443a0b2365e433ca7382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:28:46 +00:00
Treehugger Robot
c1607192c2 Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I19861c5b58c69e95efa4338da6ac85e04a752101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:28:09 +00:00
Chaohui Wang
d18cfc2bdc Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I98b6263963ef2af0e0ec42c758b7efe45bf0438d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:27:24 +00:00
Treehugger Robot
5a4638850f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 788a1ee2f6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: Iad4d1fa5bfe0de60eac2dfd499f992b6baff53ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:25:17 +00:00
Bill Yi
4d6f5e4db9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I8ad4b1df5dd2e4a1ba4d83a66b504ede5a2ac60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:25:02 +00:00
Hao Dong
6e48b99a85 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: If06b8ef33f9325d67678f442a15ae0a0dde46f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:05:26 +00:00
Daniel Huang
8de64b59bf Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

Change-Id: If96482ee38a1e3956ec1d936e555846ff66f2aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:03:38 +00:00
Treehugger Robot
08482b1d2b Merge "Support incompatible charger state in the battery main page" into udc-dev am: 54de6fd80b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981565

Change-Id: I2cc06f818546475cb1951b0e02f44f9bf4add503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:03:24 +00:00
SongFerng Wang
be40af59d7 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I70ee782ad07cc3adc092f1fdecfd1b1381dbe222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:02:02 +00:00
Daniel Huang
4f541df33e Merge "Fix Multiple UI issues" into udc-dev 2023-05-04 08:57:26 +00:00
Treehugger Robot
788a1ee2f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I180520a7cbb04c5978af4a22203b969f1d81a18f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 08:56:50 +00:00
Bill Yi
df0a1a06a3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: Ia765c4911206c444c00562b7d7220317780adec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 08:56:41 +00:00
danielwbhuang
55a3d089f9 Fix Multiple UI issues
1. Use edge-to-edge UI
2. Use new color token
3. Put text in the middle of the button

Bug:279163958
Bug:278504911

Test: manual
Change-Id: I189e9da2251f7d204ddc18680d3d1ec4638fa2db
2023-05-04 08:56:41 +00:00
Chaohui Wang
c16a088a73 Log app special permission change for SPA
Align with current logging and no package name.

Bug: 280575002
Test: Manually with App Op Permission pages
Change-Id: Ia0dde06769b1e08f8cec7cb1d87a8ca1baa80068
2023-05-04 16:36:02 +08:00
Treehugger Robot
54de6fd80b Merge "Support incompatible charger state in the battery main page" into udc-dev 2023-05-04 08:28:57 +00:00
Chaohui Wang
d5547fbcb1 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 am: 396b3b45d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I23bd63427d47a63b51ad7eee58fcb963285ee3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 08:24:06 +00:00
Hao Dong
c811f94c92 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 56f39eeb45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: Ic0348cedcd122cbbc0e4715feb4f9e7f2b569c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 08:23:48 +00:00
Chaohui Wang
396b3b45d4 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I7c302932f91793a9ab80796e4e6448c99bfd39e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 07:56:51 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +00:00
Hao Dong
56f39eeb45 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I477cd05789ff62ad6cba68908de99d426d227e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 07:37:04 +00:00
SongFerng Wang
45512c8b0c Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I60918326977b8013c69a0d1024d97a697f5769b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 07:19:53 +00:00
Hao Dong
1c9288fa24 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev 2023-05-04 07:00:40 +00:00
Hao Dong
6e8434b793 Call onFaceStrengthChanged() only when authenticators registered.
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
Merged-In: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
2023-05-04 06:59:53 +00:00
ykhung
c234196bc1 Support incompatible charger state in the battery main page
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
2023-05-04 14:57:07 +08:00
SongFerng Wang
10ed23b3c1 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: Ia7f15c8a4fd0d0cd43b093616bc04ac5dbf59e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:31:45 +00:00
Chaohui Wang
e2b9d0680e Fix SettingsDumpServiceTest
SettingsDumpService behavior changed in
Change I9d7fe2e763b9e5840ee76c5eb00bc88288e7ee41

After behavior changed, PrintWriter was wrapped in IndentingPrintWriter,
it's harder to mock the PrintWriter, so check the result directly.

Fix: 280068083
Test: RobolectricTest
Change-Id: I92a7b931c93df4cd9e9c3e47b91a9750df936f15
2023-05-04 14:20:33 +08:00
SongFerng Wang
197eb39cde Merge "Shows main_battery information for not untethered device" into udc-dev 2023-05-04 05:47:59 +00:00
Treehugger Robot
b5933a3dac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I378ffec60a2af2dd1930a002e62b4bf8099072bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:31:51 +00:00
Treehugger Robot
1a01a70537 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I08b37a2c4e1404b35cc34dd2a5f719a97824a331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:31:04 +00:00
Bill Yi
2e1b23c580 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I186a07bab8646a1fb247490283db3dbfadc045be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:31:00 +00:00
Treehugger Robot
5e8bd15267 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I3d52f46e32e2abfb9f8daa7a7bef09823f9de0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:30:27 +00:00
Tom Hsu
964ce5a785 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Idb81f53a41cc2853f218c2a6af8b9bcae8829748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 05:28:07 +00:00