Commit Graph

69232 Commits

Author SHA1 Message Date
tim peng
f658ffa193 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: 2ad6ec534a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ibaa0d5c0bda986cb668a363bd8c69372033ecfda
2020-06-24 08:26:28 +00:00
tim peng
53aac6be4d Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: 4d85ce5dce am: eea5c59fbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I15ec03bbb936f14ae7381b3299ca206a21a4cae1
2020-06-24 08:26:15 +00:00
tim peng
2ad6ec534a Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I586b3b93e37c03d27d8b582d2f10f444aa1e7500
2020-06-24 08:26:04 +00:00
Treehugger Robot
d6dc58ba1f [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours am: f9b99dcc03 -s ours am: f1c467cba6 -s ours
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: I8ef7b1529c9fb1765618e3b8e18041957f4c344b
2020-06-24 08:25:42 +00:00
tim peng
eea5c59fbc Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: 4d85ce5dce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ic83a1b2a4dc180fe1a2e97954e429c90dd6121d5
2020-06-24 08:10:05 +00:00
tim peng
4d85ce5dce Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: Ie49eabe533e8305456cc04b241596aa7c6de81b7
2020-06-24 08:05:30 +00:00
tim peng
a49b69e54f Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

Change-Id: I6a80083a72a41831069d1a25afb2f71db3282ca3
2020-06-24 08:05:29 +00:00
Treehugger Robot
f1c467cba6 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours am: f9b99dcc03 -s ours
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: Iee7a51b34008ec3059d60c7bf2c6082348b73120
2020-06-24 08:05:04 +00:00
Treehugger Robot
f9b99dcc03 [automerger skipped] Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a am: 980a6b8d30 -s ours
am skip reason: Change-Id I764f4ade8032511b44098e7eccb19b909fccc717 with SHA-1 f71eed162d is in history

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

Change-Id: I0debb7eb292f2138016f891d973bd7a0435adcff
2020-06-24 07:50:23 +00:00
tim peng
b6ed02fa26 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev 2020-06-24 07:45:36 +00:00
Treehugger Robot
980a6b8d30 Merge "Add logic for 5G icon to SIM status dialog" am: 5733d3a31a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1347925

Change-Id: Ice4cd34368434361af8220d5af85024708fee2a1
2020-06-24 07:35:30 +00:00
Treehugger Robot
5733d3a31a Merge "Add logic for 5G icon to SIM status dialog" 2020-06-24 07:18:41 +00:00
Automerger Merge Worker
8c48773858 Merge "Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc" into rvc-qpr-dev-plus-aosp 2020-06-24 06:21:14 +00:00
TreeHugger Robot
b9255eec0a Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 00b488f052
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: Ic0d25920796acdb6542e83d66ef4568fd041557a
2020-06-24 06:21:09 +00:00
TreeHugger Robot
ab495ff8e4 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I875da51acfaef3fae15723842ed859bcfdf30395
2020-06-24 06:21:09 +00:00
TreeHugger Robot
59833aaddb Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9 am: 0b04a19565
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I697667e6086ae400b862feed3f2cd46361dad014
2020-06-24 06:21:03 +00:00
TreeHugger Robot
3261d992cc Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I1f7b099cc9750618988284b32663de4c236d172f
2020-06-24 06:09:10 +00:00
TreeHugger Robot
00b488f052 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: Iecff71baa2ef3354cc18f3b8d3598ffe5e58aa37
2020-06-24 06:08:49 +00:00
TreeHugger Robot
0b04a19565 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
2020-06-24 06:08:49 +00:00
TreeHugger Robot
2309e1c188 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I6d889efedeeea69aea2ca8cca5f2f0a9b4c61639
2020-06-24 05:52:51 +00:00
TreeHugger Robot
eadd54e1d9 Merge "Fix failed test cases" into rvc-dev am: 1676454b3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I20545916f5ca886d67e10adf9c68a4656988f27d
2020-06-24 05:52:43 +00:00
TreeHugger Robot
1676454b3b Merge "Fix failed test cases" into rvc-dev 2020-06-24 05:41:14 +00:00
TreeHugger Robot
f52ca40490 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 3882212b26 am: 5a439174e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Ie98efb20b3f379125cdb10c89bd6fa3e4641ce88
2020-06-24 05:37:31 +00:00
TreeHugger Robot
01bd075969 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 7890859bec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I085d0c37268fc7db271498c6f922801f0b7b07a7
2020-06-24 05:37:17 +00:00
TreeHugger Robot
5bd3b9069e Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 1388e13655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Icd77cc1c5a0cbd2d7ad7e05d4f8318f26ef3c6c0
2020-06-24 05:37:09 +00:00
TreeHugger Robot
7890859bec Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I7e61276edaee46ab2a05eb6dcd4d62d49bd380dd
2020-06-24 05:27:17 +00:00
TreeHugger Robot
5a439174e6 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 3882212b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I2c708d38674d08ed45410a931ca598cb4bd244ec
2020-06-24 05:27:11 +00:00
TreeHugger Robot
1388e13655 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: Ida02e2c58f68842444371a30c777d7742b6522ad
2020-06-24 05:26:57 +00:00
Tim Peng
df46788a5d Apply round corner to the album icon in output switcher panel
Bug: 159766582
Test: manual test
Change-Id: I1535a13c137e9550920cf890c259a4075a2dfc05
2020-06-24 13:17:06 +08:00
Automerger Merge Worker
f4c67009ec Merge "Increase character limit. am: a5c9c0458c am: 93c232993e am: e6a67d8b7f" into rvc-qpr-dev-plus-aosp 2020-06-24 05:10:37 +00:00
TreeHugger Robot
1431d7647a Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I71f3394e1c44c881a5bc346a59c39a1968d0d29d
2020-06-24 05:10:36 +00:00
Automerger Merge Worker
e10c46dbdc Merge "Increase character limit. am: a5c9c0458c am: b9d8b08512 am: bef3383f78" into rvc-qpr-dev-plus-aosp 2020-06-24 05:10:35 +00:00
Mathew Inwood
8d7d5db33c Increase character limit. am: a5c9c0458c am: 93c232993e am: e6a67d8b7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I77188dd9b445184cd66c0107ca091477c662283a
2020-06-24 05:10:33 +00:00
TreeHugger Robot
3882212b26 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I48656a2ca05350bec1d304a05fbb00ff99b137d7
2020-06-24 05:10:32 +00:00
Mathew Inwood
b790b6305c Increase character limit. am: a5c9c0458c am: b9d8b08512 am: bef3383f78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I633e2dd1ac50bb6312d589344fe2ebcccf23fd83
2020-06-24 05:10:30 +00:00
Mathew Inwood
991289852a Increase character limit. am: a5c9c0458c am: b9d8b08512 am: c0b9bdda25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ia774fd4417af3f4e43eaa9e6cf9d0bea4b4c2d25
2020-06-24 05:10:21 +00:00
TreeHugger Robot
334985feab Merge "Fix com.android.settings.media test case fail" into rvc-dev 2020-06-24 05:01:33 +00:00
Mathew Inwood
bef3383f78 Increase character limit. am: a5c9c0458c am: b9d8b08512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I4f1001a08015128b991d09bd6c850142a923fe95
2020-06-24 04:53:28 +00:00
Mathew Inwood
e6a67d8b7f Increase character limit. am: a5c9c0458c am: 93c232993e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ib66ae07194a7a6d9cb78b6e1b556cff2be81051f
2020-06-24 04:53:20 +00:00
Mathew Inwood
c0b9bdda25 Increase character limit. am: a5c9c0458c am: b9d8b08512
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Icf6cf75f5d4268139128399354d5adf2b93013a2
2020-06-24 04:53:14 +00:00
Mathew Inwood
b9d8b08512 Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: If8a2bd69135aa967a87cffc3db19e6d5a25b0be5
2020-06-24 04:41:23 +00:00
Mathew Inwood
93c232993e Increase character limit. am: a5c9c0458c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Ifc81b836b436ebd7b4b6bcf498085ecd9a3c603e
2020-06-24 04:40:52 +00:00
Jason Chiu
98a8640de2 Fix failed test cases
Test: robotest
Fixes: 159688624
Change-Id: I28d53e38000d2dfb00bde900647eb38eda279c9a
2020-06-24 10:55:31 +08:00
Hugh Chen
336ff700a2 Fix com.android.settings.media test case fail
Bug: 159760643
Test: make -j42 RunSettingsRoboTests
Change-Id: I17246088ade1b5e17974ccf24a5e40b915146574
2020-06-24 10:54:43 +08:00
Sarah Chin
de62ae7ff4 Add logic for 5G icon to SIM status dialog
Test: manual test with fake 5G data network type
Bug: 156815536
Change-Id: I764f4ade8032511b44098e7eccb19b909fccc717
Merged-In: I764f4ade8032511b44098e7eccb19b909fccc717
2020-06-23 15:32:07 -07:00
Mathew Inwood
a5c9c0458c Increase character limit.
20 is not enough for several languages.

Test: TH
Bug: 159628588
Change-Id: I9f7b47951ea5a4e0eb2022347ebd5ea0db7f0c9e
2020-06-23 14:09:52 +01:00
Sarah Chin
f006e22732 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: b040b0daa7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: I065f0e931dafb911cca820e9c25935e1297b3fa3
2020-06-23 07:48:19 +00:00
Automerger Merge Worker
a426052c7c Merge "Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e am: 5a2cb51b02" into rvc-qpr-dev-plus-aosp 2020-06-23 07:47:37 +00:00
Sarah Chin
142ae30f14 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: b947a7f7bf am: 19a42896e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Idc6335aa0d076de523c3c67d33c84becd5248906
2020-06-23 07:47:30 +00:00
Sarah Chin
a6dd027c01 Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c am: 89cc02986e am: 5a2cb51b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142

Change-Id: Ia19670d882a15331db622d80dad2f457a9c8a2f1
2020-06-23 07:47:23 +00:00