Commit Graph

88959 Commits

Author SHA1 Message Date
Automerger Merge Worker
7b39efbf6c Merge "Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f" into sc-v2-dev-plus-aosp am: c43ed2759b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I7769ddf256b1ced4e8b3ea3c747a60a17b99451c
2021-06-15 12:03:55 +00:00
Syaoran Kuo
cd1046f072 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: db65894caa am: e530f19b74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I4908415a76af918eefff4752a0103e27517fa5e8
2021-06-15 12:03:39 +00:00
Automerger Merge Worker
c43ed2759b Merge "Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f" into sc-v2-dev-plus-aosp 2021-06-15 11:51:57 +00:00
Syaoran Kuo
76cab26187 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 394955220f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ifb919f496a58b400ce5cd09796d6b4f6caa21252
2021-06-15 11:51:53 +00:00
Syaoran Kuo
e530f19b74 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: db65894caa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ib54ed9d6c729716f138d0a3de11da63fe3063230
2021-06-15 11:51:52 +00:00
Syaoran Kuo
11029951a6 Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff am: 294c9201ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ib478f7aa62ff2a6128e44a7195d1a562153288cf
2021-06-15 11:51:01 +00:00
Syaoran Kuo
db65894caa Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I2e8581960e9fce769d0a8fde057d8582cbd22c2b
2021-06-15 11:36:58 +00:00
Peter Wang
8b3c990fc3 Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 130ac0729b am: 855cf531ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I7ed60be9392e27d73bda016b300d428cabccad35
2021-06-15 11:36:53 +00:00
Peter Wang
7a62ac2e85 Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 6117cfbaad am: cd70049ff7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: Ifc6274077bbeb5cc16ba9e3667ec720365b1d8e3
2021-06-15 11:36:27 +00:00
Syaoran Kuo
394955220f Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: Ie1a623195806655f7f80832ad2d86d3865dd991a
2021-06-15 11:36:12 +00:00
Syaoran Kuo
294c9201ea Merge "Fix resource id not match issue." into sc-dev am: 66eaa371ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14880643

Change-Id: I3108b14e2d0433fcd365487dca02d9819d27aab7
2021-06-15 11:36:07 +00:00
Peter Wang
855cf531ca Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 130ac0729b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I050c1d75ae0ab0160fb20c6159c3de9b236a57f4
2021-06-15 11:27:34 +00:00
Peter Wang
cd70049ff7 Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 6117cfbaad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I97bcffcda53455156bfb9cc818250638c227b30a
2021-06-15 11:27:25 +00:00
Peter Wang
8ca1af4b9f Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749 am: 655375feff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: If6474f55d2aeb56cb3dbdb345f199c438ae9fd3e
2021-06-15 11:26:52 +00:00
Syaoran Kuo
66eaa371ff Merge "Fix resource id not match issue." into sc-dev 2021-06-15 10:48:58 +00:00
Peter Wang
6117cfbaad Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I18ce09ecc9cebe0424f564c587d27545b7e58b47
2021-06-15 10:19:10 +00:00
Peter Wang
655375feff Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: Ia0bf224ad24c0d8a4913f3bc80eeec7cbf499f1d
2021-06-15 10:18:26 +00:00
Peter Wang
130ac0729b Merge "Use BC theme for ChooseSimActivity" into sc-dev am: 03d2f8d749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14942792

Change-Id: I0d1c251e892da779e70c5078cb7cd22af754dd87
2021-06-15 10:18:22 +00:00
TreeHugger Robot
c4dbb35ced Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 37a2aed385 am: 198496fc58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I75250922dc21430739679ea555e119989b52c2aa
2021-06-15 10:05:07 +00:00
TreeHugger Robot
12235ed496 Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: 72ce05c82e am: 8ff91653de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I1962323a3bb0b146a9826db3a326df6fdaf5595d
2021-06-15 10:05:01 +00:00
TreeHugger Robot
1e3fee7f75 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 57c1cb6209 am: bc015dec40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: Idbe47ce455dcc25c3a855d1d7bebb5fdd1b58115
2021-06-15 10:04:55 +00:00
TreeHugger Robot
76c168a740 Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: c497a9602b am: 3ba09390a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: Ic910f1564343e8315d2800dc680b86d411043019
2021-06-15 10:04:43 +00:00
Peter Wang
03d2f8d749 Merge "Use BC theme for ChooseSimActivity" into sc-dev 2021-06-15 10:02:34 +00:00
TreeHugger Robot
198496fc58 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 37a2aed385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: If7082e6ff25efbfc1173a9c699eda3a2146461e5
2021-06-15 09:53:06 +00:00
TreeHugger Robot
8ff91653de Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: 72ce05c82e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: Ief9e494c4e941be26f57f6aeef146d1a41bc4411
2021-06-15 09:52:44 +00:00
TreeHugger Robot
bc015dec40 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 57c1cb6209
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I20ea3c6483c6fdd9f319220ae4f744861c652bed
2021-06-15 09:49:13 +00:00
TreeHugger Robot
3ba09390a3 Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: c497a9602b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I01e7f9c62335f2c5fd7ab943a5de9db02b687b3f
2021-06-15 09:49:05 +00:00
TreeHugger Robot
3b935d7543 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da am: 43dad72bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I8e880ab0ac3cd8cfa89ec949252ab11826c20ac5
2021-06-15 09:48:29 +00:00
TreeHugger Robot
ac44f3569a Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e am: 479c1a1c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I7f9cf20b6aab539555df3e9644f2d499252f3467
2021-06-15 09:48:18 +00:00
TreeHugger Robot
994ff53a1f Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: 339c1b5d12 am: eb6ef210bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: Ic062335d4ef5835938387fee3ba1b5720644288f
2021-06-15 09:44:51 +00:00
TreeHugger Robot
7f54cb534f Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: c567927880 am: 109ef014d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: Idcca7d251da74c5816dbb8621063304a3557f348
2021-06-15 09:44:38 +00:00
Weng Su
58a651566f [Provider Model] Remove Wi-Fi disconnect action
Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: I964bf8de4f5eee1523943876567bf565ccb7f995
2021-06-15 17:43:31 +08:00
TreeHugger Robot
37a2aed385 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: Icb4cafb51fe77a836b2cfa7dae1dd2cd382715a5
2021-06-15 09:36:59 +00:00
TreeHugger Robot
72ce05c82e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I955d19d4ec913270fb6441f26e8d7dd2ca411b42
2021-06-15 09:36:51 +00:00
TreeHugger Robot
43dad72bff Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I9c63453411446c05b0f959861c4b0fac6e1c404a
2021-06-15 09:36:10 +00:00
TreeHugger Robot
57c1cb6209 Merge "Add loading progress to Internet Settings" into sc-dev am: 2ff8b363da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934764

Change-Id: I8757ccca71cf6efd33dc8b3f539fad4dadd35ff1
2021-06-15 09:36:10 +00:00
TreeHugger Robot
479c1a1c5d Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: Ibb9fbd5e9013b1696d3c43358f270fef286a3bec
2021-06-15 09:36:05 +00:00
TreeHugger Robot
c497a9602b Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev am: 1ce0d1117e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14934760

Change-Id: I700f9a5a773862358e19ded911f634962571aa4f
2021-06-15 09:36:04 +00:00
TreeHugger Robot
eb6ef210bb Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: 339c1b5d12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: Iee48abc1660cce344c899ce131774fe4dadf8e0f
2021-06-15 09:32:36 +00:00
TreeHugger Robot
109ef014d6 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: c567927880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I3ce0e11180b9fb6b30d1c6bed310746355ddc9dc
2021-06-15 09:32:08 +00:00
TreeHugger Robot
5d587bfb79 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2 am: 033a6c3eec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I9114c64261818c7628dae0f78e3b88b2f2979db3
2021-06-15 09:31:47 +00:00
TreeHugger Robot
2ff8b363da Merge "Add loading progress to Internet Settings" into sc-dev 2021-06-15 09:24:27 +00:00
TreeHugger Robot
1ce0d1117e Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev 2021-06-15 09:23:58 +00:00
TreeHugger Robot
c567927880 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I1a58e0c64d0d9f86c8d048b672299d85f3da8429
2021-06-15 09:20:02 +00:00
TreeHugger Robot
033a6c3eec Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I484d68f6faa3ad4b6f6720542bcf27430a1fd685
2021-06-15 09:19:14 +00:00
TreeHugger Robot
339c1b5d12 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev am: 153c3a1dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14956530

Change-Id: I489bda723baaeedec879e5d973d5b5f066086455
2021-06-15 09:19:13 +00:00
TreeHugger Robot
153c3a1dc2 Merge "[GAR] fix spoke a percentage number is not the same as displayed content" into sc-dev 2021-06-15 09:11:18 +00:00
TreeHugger Robot
3734eb9883 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2 am: 6d4d55fb3b am: 59772be97e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: Ia4af3d8efd8506c698ba21a119f6d36bbee43275
2021-06-15 08:52:55 +00:00
TreeHugger Robot
5e27e4c615 Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2 am: 4c123f2e17 am: c82a02c34b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: I6e0e51f17c192863c08e3b369cf6e42d61f35ede
2021-06-15 08:52:44 +00:00
TreeHugger Robot
59772be97e Merge "Revert "[Provider Model] Add WiFi toggle in internet panel"" into sc-dev am: 68079c7bd2 am: 6d4d55fb3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964819

Change-Id: I12aec616392ebdf1952e11ac19ed487cb6ce6ce5
2021-06-15 08:26:03 +00:00