Commit Graph

125645 Commits

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

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

Change-Id: I65f4dc56f3d93256e64a1423ed1431191887ae08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 16:05:11 +00:00
Lucas Silva
dc0ac9407e 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: I7bcd2aa9ca3700890505a9a2f704a461f1f3e498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:49:25 +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
51b4b2dd2e 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: I60ba44bba4faf49f3b7ddf3a651ac2c75ef672a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 15:28:07 +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
Chaohui Wang
c1e45930c2 Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: 8c2d64a2b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

Change-Id: Id00940b6014ee9e706a4c6bf050f5c9c72ba41ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 14:44:25 +00:00
Chaohui Wang
4a08db6f0c Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: e9540185f1 am: 465a31a677 am: 01722dbe3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

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

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

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

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

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

Change-Id: Ia18271cfae10f8508d79c1f42d87e42e2f0717a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 12:05:39 +00:00
Hao Dong
12b8390774 [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 6e48b99a85 am: f434a18379 -s ours am: bb0f8ec526 -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: Id279b1edbb12ed3047811d55dfa738499b0bae66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 12:05:16 +00:00
Chaohui Wang
01722dbe3f Merge "Update for getSystemPackageNames" into udc-dev am: 3f4820bdf1 am: e9540185f1 am: 465a31a677
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948670

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

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

Change-Id: I9f4b6a34b16e3ec9da42eeaecdd6c0dd21a2abf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:32:25 +00:00
Treehugger Robot
1fd622bb59 [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: 6bf6e16376 -s ours am: b4ef601ea8 -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: If6e64802424903a914b6a09515fe502a1725d87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:31:29 +00:00
Bill Yi
98606599f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: bcdf539e99 -s ours am: c28b2b8c18 -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: I3c662a49298eb26c154617b4f03bf9b833c58e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:31:26 +00:00
Daniel Huang
9830c8f87c Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: da19d4a244 am: 80155a1f9f am: c0821537d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

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

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

Change-Id: Idc22ab23635982f71f1deffbef74a80aba04a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:29:28 +00:00
Hao Dong
23476e8d1c [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 6e48b99a85 -s ours am: 0e69c0bb68 -s ours am: b9af0dc1a9 -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: Ib9306b1992250a958272cfe5d2c8a4bd55de7023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:29:15 +00:00
SongFerng Wang
c89d9cd3ca Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: be40af59d7 am: 0cac65eb1f am: a8aab25f43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

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

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

Change-Id: I1a30e758cdba428754bd338185e8aaed85cc9dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:28:35 +00:00
Chaohui Wang
465a31a677 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: I57ecb43e744f77a7d9ab048ae7c21a9f6da983f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:15:25 +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
Treehugger Robot
8d2f9d720a [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: 5a4638850f -s ours am: 10c7c7c39c -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: I5922b764e57f93f9380f46871964a737d8fba89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:54:34 +00:00
Bill Yi
4352a4a662 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: 4d6f5e4db9 -s ours am: 14da53f6e5 -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: I7f2877287d1d5013226e7fa9171ed98574c41004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:54:25 +00:00
Daniel Huang
c76fbb6698 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: da19d4a244 am: bee2385875
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

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

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

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

Change-Id: I6e1ce3e7cfcb8c24fc27507fb2b54c06c1bfc02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:33:57 +00:00
Hao Dong
bb0f8ec526 [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 6e48b99a85 am: f434a18379 -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: I68c2791e02c71a84b51e24f1284bdd153e14c0d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:33:07 +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
SongFerng Wang
3bc9c2d28f Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: be40af59d7 am: 78464f29ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I568e9ea8cec3f6d166e77b1bc60607dfa7312dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:30:21 +00:00
Treehugger Robot
b4ef601ea8 [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: 6bf6e16376 -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: I4e121ebc4dccda944c08c937bd4e7f2c4a70766e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:22:12 +00:00
Bill Yi
c28b2b8c18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: bcdf539e99 -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: I6c728c79c529cdbb9fce235533a19f89704fdfc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:22:05 +00:00
Daniel Huang
c0821537d2 Merge "Fix Multiple UI issues" into udc-dev am: 4f541df33e am: da19d4a244 am: 80155a1f9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22985401

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

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

Change-Id: Id707fd0f78830458dd7b9d7059a54cb2d61663d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:16:57 +00:00
Hao Dong
b9af0dc1a9 [automerger skipped] Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 am: 6e48b99a85 -s ours am: 0e69c0bb68 -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: I7615671d8a2c7d50f5973bb6a2239689cd748b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:16:36 +00:00
SongFerng Wang
a8aab25f43 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: be40af59d7 am: 0cac65eb1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

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

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

Change-Id: I37a3df3fc52fff6e2682a122c60ac1ff98a42581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:11:00 +00:00
Treehugger Robot
10c7c7c39c [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: 5a4638850f -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: I4b711c57b6b8b0177d3c6741b5d734666dd0181b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:10:15 +00:00
Bill Yi
14da53f6e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: df0a1a06a3 -s ours am: 4d6f5e4db9 -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: I5f812197055577ba14ea21426c44520fe2d08908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:10:02 +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