Commit Graph

125988 Commits

Author SHA1 Message Date
Han Xu
db7883f0ed Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05 am: ba00173dd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I96349b64c76c1245ca91460046700c377ba6ce6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 14:49:58 +00:00
Han Xu
ba00173dd8 Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178

Change-Id: I4c4af3d411c2cd86958aafea98597aca5d111fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:46:53 +00:00
Treehugger Robot
d13fe679b4 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc am: ef264fb304 am: 31d2f2b70c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Ie462815406032953ba0d7d2e0e40d9e6c80dcd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:07:20 +00:00
Treehugger Robot
31485268f1 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: e42c86703b am: e2f4b5d242
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I0610e557c82a9fe5d940a9ace3afdde57375d7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:07:10 +00:00
Treehugger Robot
0a55ac9fd9 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47 am: 33ba391274 am: 01624257fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Ia2aa3c5dcf6497968e09ac0a5af62446c76273dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:06:59 +00:00
Treehugger Robot
d49b3b4e13 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f am: c19f24b092 am: d0304faca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Ifeadc463101f9036d564274209909696232580ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:06:48 +00:00
Treehugger Robot
283ac268dc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc am: 06e92b4bf8 am: e2ac5c55dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I47cb422845460895ca9ad8b3a387f524ad09242c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:06:36 +00:00
Treehugger Robot
fac2f8adb3 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: 2ea4f0747e am: 674600b53f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Id2183478d1b79acbc7c2608e1ed7342a5dc70d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 13:06:24 +00:00
Treehugger Robot
31d2f2b70c Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc am: ef264fb304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I667fccc9685486740b61c0f0545e20694d6affe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:24:32 +00:00
Treehugger Robot
e2f4b5d242 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: e42c86703b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I0b4e8fa0a9abffeb8dd459386f037380eb0d3d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:24:13 +00:00
Treehugger Robot
01624257fb Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47 am: 33ba391274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I2c3540a7c7828f23ebb8ce13a8c237cfd772ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:20:09 +00:00
Treehugger Robot
d0304faca7 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f am: c19f24b092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I49397ccb1702f6c802c220c2a526a6dbec497e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:19:59 +00:00
Treehugger Robot
e2ac5c55dc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc am: 06e92b4bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Ib93f52eec186b4f3aeb535cf708d6184576b8b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:19:51 +00:00
Treehugger Robot
674600b53f Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: 2ea4f0747e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Ib012475ebf31463dd2249c95cf7e33d34a2360cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 12:19:37 +00:00
Han Xu
2f970a1a05 Merge "Fix wifi QR layout to fix image stretching" into udc-dev 2023-05-08 12:17:59 +00:00
Treehugger Robot
33ba391274 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Ib5467588c0b5c6cc68f97d95bdeb58f84e115b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:43:20 +00:00
Treehugger Robot
c19f24b092 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I8f129892f4f10838a059730436d4ae957846b476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:43:12 +00:00
Treehugger Robot
ef264fb304 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I07d591bbec5d5d2fe68d019613c424d319750f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:42:13 +00:00
Treehugger Robot
e42c86703b Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:42:00 +00:00
Treehugger Robot
06e92b4bf8 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:38:52 +00:00
Treehugger Robot
2ea4f0747e Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Ieeb3a1b72e00c95592374b5e595e5b2d01906ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:38:45 +00:00
Treehugger Robot
6da502033a Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 2b6cf42130
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I6d2fb3b56242c3f2e089093cbe3081e2ef0ac30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:38:37 +00:00
Treehugger Robot
6a2d24093f Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 9e7da7aaba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I4716b5ae4497002fa1fedd9320af07422483a38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:38:26 +00:00
Treehugger Robot
b5682235cc Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:00:53 +00:00
Treehugger Robot
2b6cf42130 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I5f349188e8965a7063c2ae5dfdbec6900e2e9855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 11:00:45 +00:00
Treehugger Robot
dc11c24806 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:59:44 +00:00
Treehugger Robot
9e7da7aaba Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: Idb7bba03da26ed237bf0b5a726506effb5ff6e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:59:43 +00:00
Treehugger Robot
93ab64ef47 Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181

Change-Id: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:56:22 +00:00
Treehugger Robot
99c883fd3f Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645

Change-Id: I7544b0326987e4397d7baab8514b1d1388d52005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:55:48 +00:00
Treehugger Robot
23d3eda967 Merge "Fix the battery string incorrect spelling" into udc-dev 2023-05-08 10:36:09 +00:00
Treehugger Robot
fb1cebd7f9 Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev 2023-05-08 10:25:06 +00:00
Angela Wang
dea0344933 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 07ee2d859d am: 8341fad6bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ie23392df4b673a1839aa8154c75bf31275272939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:19:38 +00:00
Angela Wang
b1de4fbe7a Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02 am: afe6a6388b am: 87c42f29b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I3afd7dc3542c4db13f89785ee27672ece72ac443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:19:22 +00:00
Angela Wang
83218ce7c0 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 3716e194b1 am: 37301c7e72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I5678cce522cf7aa5af92d8670768f3244245193c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:18:42 +00:00
Angela Wang
8341fad6bf Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 07ee2d859d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I70cc5f8eca57b243fde998bd1ce4e0d0b8075b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:58:35 +00:00
Angela Wang
87c42f29b0 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02 am: afe6a6388b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ic4b511e26cc6d3c5b401addec8bf6a408e882f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:49:02 +00:00
Angela Wang
37301c7e72 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 3716e194b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ia51ee15c9ea0add3538c7a78a6995bba4e88ffbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:48:54 +00:00
Angela Wang
afe6a6388b Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Iad821e17698321a88b6464fc0693b340d7141748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:15:58 +00:00
Angela Wang
07ee2d859d Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ibfdba3482f10fd329b039449a006e3bf4ef0bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:15:23 +00:00
Angela Wang
d72f221a9b Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: 75b08ce5ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I1c8e3f1fbc69031a6837ea565be008088d4493b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:11:21 +00:00
Angela Wang
3716e194b1 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:11:21 +00:00
Milton Wu
13c9606849 Merge "[BiometricsV2] Refine fingerprint ui and flow" 2023-05-08 08:41:36 +00:00
Charles Chen
0f00b5e1e1 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 2bc77140bb am: 0eeb5c9ccb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Ibf340862c3a531db2a8357a186c7a0b5c85937d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:35:12 +00:00
Charles Chen
97266f7ed4 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d am: 8ad361f548 am: 11534c33c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: If55688c5d5675f5f78feb6cd809521ceff640664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:34:45 +00:00
Charles Chen
d7b1cd0c53 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 4a048e404a am: 38576cb446
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I26ded3805bd3f7bd26bffc35a0013cdf123cace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:34:13 +00:00
Angela Wang
b03509284e Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:33:26 +00:00
Angela Wang
75b08ce5ab Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I2b92a152a995f46684c2ebfc4a83694691f60743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:33:26 +00:00
Angela Wang
f676c35f02 Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482

Change-Id: I80b2e6a7bbe73212482521e5810430b9dcd0252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:29:26 +00:00
ykhung
f31c8a477f Fix the battery string incorrect spelling
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
2023-05-08 16:10:27 +08:00
Han Xu
d2e6c2fe6d Fix wifi QR layout to fix image stretching
Bug: 270063908
Test: manual
Change-Id: I86e7d54bb78306292fcb355c1a4879a43cc876f7
2023-05-08 15:58:04 +08:00