Commit Graph

72839 Commits

Author SHA1 Message Date
Tim Peng
480409ca7b Add bottom padding in SliceView for output switcher panel
Bug: 159760833
Test: manual test
Change-Id: Ide1c68da0b5225e3341cd96ff9a786b483c15e5d
2020-06-24 09:18:50 +00:00
Tim Peng
382f81a570 Update ouput switcher panel height from 6.5 to 5.5 slice items
-design changes

Bug: 159776397
Test: manual test
Change-Id: I57a343ad6aeeb420d5d9f8eb1cd921a2c8bfa27d
2020-06-24 17:14:25 +08:00
tim peng
17eaded572 Merge "Apply round corner to the album icon in output switcher panel" into rvc-dev am: b6ed02fa26 am: a49b69e54f am: c679982b97 am: 40b1ae5de3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970211

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

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

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

Change-Id: I18f11b4a1a753c70026132c0b80c179d1bbb09a8
2020-06-24 08:36:40 +00:00
Treehugger Robot
aa995f48f5 [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: d6dc58ba1f -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: Ief7178cee01106fa268cb892b5951a3de2ae28c9
2020-06-24 08:36:16 +00:00
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
tim peng
c679982b97 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: I781f348cce1064ca6547eac0697d507cac844fb5
2020-06-24 08:25:58 +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
Sarah Chin
1017caf120 Remove NR NSA from voice network type
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.

Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
Merged-In: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-24 00:40:40 -07: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
1ab4281ad0 Merge "Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: 2309e1c188 am: 3261d992cc" into rvc-qpr-dev-plus-aosp am: 8c48773858
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

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

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

Change-Id: I0ce4b7c98f7932d1b20893cca503b071eb3bb057
2020-06-24 06:34:08 +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
b9fc5c829b Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 3882212b26 am: 5a439174e6 am: f52ca40490
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

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

Change-Id: I7657c740df6a1e2d7b3c4fb5fff62ae4167cf20f
2020-06-24 05:53:21 +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
5c5f5bdef0 Merge "Fix com.android.settings.media test case fail" into rvc-dev am: 334985feab am: 1431d7647a am: 1388e13655 am: 5bd3b9069e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970205

Change-Id: I949c89b01ebb5e72810c4325370ab4443b9728bc
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
Automerger Merge Worker
36f6d75eaa Merge "Increase character limit. am: a5c9c0458c am: 93c232993e am: e6a67d8b7f" into rvc-qpr-dev-plus-aosp am: f4c67009ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I92acdd98a6e22d1efba809a172a91733c8394040
2020-06-24 05:27:49 +00:00
Automerger Merge Worker
e1ce54eaee Merge "Increase character limit. am: a5c9c0458c am: b9d8b08512 am: bef3383f78" into rvc-qpr-dev-plus-aosp am: e10c46dbdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: Idde7f56695d3e1e07a7f2354d7ec95f618d9b7b7
2020-06-24 05:27:24 +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
Mathew Inwood
15da834b5b Increase character limit. am: a5c9c0458c am: b9d8b08512 am: c0b9bdda25 am: 991289852a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11971198

Change-Id: I83ec52735d84a1432bafeabc57659e9ae5f5f809
2020-06-24 05:26:58 +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