Guangjie (Jerry) Shi
6e2724c62d
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: f3e24a0595
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Iad77b961d8b9352e14732a9bfb0311e23dac7348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:54:02 +00:00
Guangjie (Jerry) Shi
01e1a4c0fd
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
am: 38a3645ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I8ad61423e61cd583fb9698c469935a6618ab83d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:39:36 +00:00
Xiaozhen Lin
1e3a085121
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: cf18fba86c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: Ia1c9dfaa13adb5a97f2e6a562e99134c4ca3bb79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:38:49 +00:00
Xiaozhen Lin
8a16522a44
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
am: b0df220382
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: Ifb3b9d5ab39f06d954163d46e3ff7c339b385e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 18:32:21 +00:00
Guangjie (Jerry) Shi
38a3645ad1
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: I3beee0f10d1f007b8df76f3871a01bae7121d013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:55:30 +00:00
Guangjie (Jerry) Shi
f3e24a0595
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev am: 817ee8489f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001498
Change-Id: Ie4d4a6cdc9e94ce2143255e7f380ff7492abe825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:31 +00:00
Xiaozhen Lin
b0df220382
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I6706bf4e642f5a7dbfdd6ec6f328382644407b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:54:02 +00:00
Xiaozhen Lin
cf18fba86c
Merge "Password clearing in Settings App" into udc-dev am: be911918d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22914954
Change-Id: I13fad162f2d5f1b92ee90a079dea99fc68114c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:52:46 +00:00
Guangjie (Jerry) Shi
817ee8489f
Merge "Modify the usage of setEnabledProvider to temporarily passed in empty list." into udc-dev
2023-05-04 17:33:03 +00:00
Xiaozhen Lin
be911918d0
Merge "Password clearing in Settings App" into udc-dev
2023-05-04 17:09:34 +00:00
Lucas Silva
f1183c161b
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 5cd017f470
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: I50f6924f38b0252135ae579d222aa8085a3dc5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:10:25 +00:00
Lucas Silva
69b0fd5d45
Merge "Update DreamAdapter to set icon tint colors in xml" into udc-dev am: d66bde103a
am: 86231b9ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23004698
Change-Id: If7e797520ae040dc9439b6c304da6afb9c09ca84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:46 +00:00
TreeHugger Robot
878a4ac1df
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 76edddc1c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: Ia5830736de9c3d15256343f579e5e022feaf1d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:09:39 +00:00
Lucas Silva
5cd017f470
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: I067595333640ccba5b76f54a2b529049869192c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:06:07 +00:00
TreeHugger Robot
777e3778dd
Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev am: 3a2b8e81e5
am: 1765b7d866
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22961321
Change-Id: I4784eabb88684a4d18bf0bee1947f4178babe973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 16:05:54 +00:00
Jerry Shi
645ba04085
Modify the usage of setEnabledProvider to temporarily passed in empty
...
list.
Test: local test
Bug: 280492574
Change-Id: Id13aea203636527bcda745727aae417b2a8e289c
2023-05-04 08:57:43 -07:00
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
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
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