Automerger Merge Worker
eb036399eb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: I1c94629f0d01ada4c0a6444ab11aa685a7414f4b
2020-02-28 00:26:23 +00:00
Daniel Sandler
c1f6891ef3
Merge "Support updated rendering of conversation icons." into rvc-dev
2020-02-28 00:26:10 +00:00
Nathan Harold
b10babebd0
Optimize NetworkScan for only User-Enabled RANs
...
Network scans comprise multiple different access
technologies, and scanning each of those techs can
be very time consuming. Worse, depending on a user's
settings, the device may only be allowed to connect
to 2G, 2G+3G, or 2G+3G+4G networks. If a scan finds
network types that a user can't connect to, it also
creates a poor user experience if a user tries to
select those network types.
This CL restricts the scans to only find and return
results that a user can select based on the other
user settings.
Bug: 128572818
Test: manual (crosshatch) - set allowed networks to
2G+3G and verify that LTE networks are not returned.
Set allowed networks to 2G+3G+4G and verify that LTE
networks are returned.
Merged-In: Ic855100723b8604c1e872457a70fd8f25d225278
Change-Id: Ic855100723b8604c1e872457a70fd8f25d225278
(cherry picked from commit bda277b3b6
2020-02-27 16:10:19 -08:00
Xin Li
9fe7d6c59b
DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master
...
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
2020-02-27 15:45:16 -08:00
Xin Li
28f9734a4a
Skip QQ2A.200113.001 in stage-aosp-master
...
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
2020-02-27 15:36:13 -08:00
Automerger Merge Worker
6a8012fc7b
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: bbab2a3873
...
Change-Id: Ib20b72e1dc8d1845b83f6aec4cf53059728b5f39
2020-02-27 21:58:38 +00:00
Automerger Merge Worker
23150c4195
Merge "Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 am: 32ab3a1853" into rvc-qpr-dev-plus-aosp
2020-02-27 21:57:18 +00:00
Automerger Merge Worker
a5120ebc95
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 am: 32ab3a1853
...
Change-Id: Id63b2dc5510323742947e6cefac2c1a98508f65a
2020-02-27 21:57:15 +00:00
Automerger Merge Worker
37dc275e08
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: 81a89153f0
...
Change-Id: I00144920b20fe8d470bb3c2d790be39c591dbd96
2020-02-27 21:57:12 +00:00
Automerger Merge Worker
bbab2a3873
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1
...
Change-Id: I1e26b6f490b721c7f6926cf5a0b3888a38223597
2020-02-27 21:50:12 +00:00
Automerger Merge Worker
32ab3a1853
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0
...
Change-Id: Ib8df9d0b2ed001e302ddd22229f1de0f88ff06eb
2020-02-27 21:47:25 +00:00
Automerger Merge Worker
81a89153f0
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1
...
Change-Id: I6c648118389e8f6830ac939528d6f8c2609fa52c
2020-02-27 21:46:41 +00:00
Automerger Merge Worker
4d3c4518e0
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8
...
Change-Id: Iebe5c8a425ac02ed99ea8fd468e870cdf6ddac19
2020-02-27 21:34:45 +00:00
Automerger Merge Worker
52be7605c1
Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8
...
Change-Id: I76f743fcdd60e45fd5fc8084d86efd8005c33dbc
2020-02-27 21:34:25 +00:00
Julia Reynolds
7b9101e6a8
Merge "Unhide work profile icon" into rvc-dev
2020-02-27 21:27:08 +00:00
Automerger Merge Worker
c4bd8fec2c
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4 am: 07d2bbaa8a
...
Change-Id: I8f7c114e6f7a97e31df48a3a79ca0b85add07df3
2020-02-27 16:19:41 +00:00
Automerger Merge Worker
5ebc70225e
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: d6b261c49e
...
Change-Id: I7116d882593e821cd36dccad83a274356f55e68f
2020-02-27 16:18:44 +00:00
Automerger Merge Worker
117f719ba6
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: 54933e3bb5
...
Change-Id: I8dea224359f1cf862fe30493f16e97d435820893
2020-02-27 16:16:56 +00:00
Julia Reynolds
323e9315d3
Unhide work profile icon
...
Test: Manual, dismiss work profile notif, look at history
Fixes: 150361222
Change-Id: I7bf17b400f084f5e1a0763c2b6d1ebe69c78b9c2
2020-02-27 11:12:46 -05:00
Automerger Merge Worker
54933e3bb5
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1
...
Change-Id: I69ec23901a68268f03fdb718a4ca02781a34e1ac
2020-02-27 15:58:57 +00:00
Automerger Merge Worker
07d2bbaa8a
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4
...
Change-Id: Ibc384b968d9821763dffb077bc60d5a2cb36eb08
2020-02-27 15:58:54 +00:00
Automerger Merge Worker
d6b261c49e
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1
...
Change-Id: I38cf1e8f818084261759f2aca0c9d21f2c34e82d
2020-02-27 15:58:41 +00:00
Automerger Merge Worker
c86e3124d4
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0
...
Change-Id: I97d2c2c3e80af00c64a54cfb7a6c0e844b2610a6
2020-02-27 15:49:31 +00:00
Automerger Merge Worker
15dbc718e1
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0
...
Change-Id: I6db41bb009930b62191d6066bfc4fcb958b66b2d
2020-02-27 15:49:26 +00:00
James Lin
0c3bd003d0
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev
2020-02-27 15:37:22 +00:00
Automerger Merge Worker
ac3216adc3
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 0c94f7f87e
...
Change-Id: Ib2383d97abb176dd2437d543f8d149a7114a34e6
2020-02-27 12:02:32 +00:00
Automerger Merge Worker
226be880c9
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e am: 594f014fa3
...
Change-Id: I2aaa8009cdf337be63c50e1b8d51c641f8c62ef2
2020-02-27 12:02:28 +00:00
Automerger Merge Worker
8c8c9d7bfc
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 764a7eb922
...
Change-Id: I871ff8341511d56977f1927fd969a6201cc1ce31
2020-02-27 12:02:19 +00:00
Automerger Merge Worker
0c94f7f87e
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282
...
Change-Id: Iec4002f07c246c21d0796652a30ce22e86c83d7a
2020-02-27 11:47:56 +00:00
Automerger Merge Worker
594f014fa3
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e
...
Change-Id: Ic4f7a701b016948d73fdf111824bf08e63443187
2020-02-27 11:47:56 +00:00
Automerger Merge Worker
764a7eb922
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282
...
Change-Id: I4b276c003efe8e49f37bda5b58c91d196c275f0a
2020-02-27 11:47:40 +00:00
Automerger Merge Worker
d2750a8d0e
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde
...
Change-Id: I4f82e4de83cc7982ea791d65dd8a97fc882f13a9
2020-02-27 11:35:52 +00:00
Automerger Merge Worker
5c5d6ce282
Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde
...
Change-Id: If8492d184dad2daa43dcf5e39206cb029dad72e3
2020-02-27 11:35:46 +00:00
TreeHugger Robot
4e3b62adde
Merge "Minor change to cross profile setting subtext." into rvc-dev
2020-02-27 11:17:18 +00:00
Arc Wang
a001e42d7b
[Wi-Fi] Fix hint text color contrast problem in 'Add networks'
...
To raise hint text color, set android:attr/textColorSecondary
to android:textColorHint.
Bug: 146908018
Test: accessibility scanner
Change-Id: Id2525c1a0fc0b3f95298d493e2dc69b91aa13d77
2020-02-27 18:36:20 +08:00
James.cf Lin
64ac0d4a74
[Settings] "Data during calls" in DDS SUB is still in advanced option.
...
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.
Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest
Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
2020-02-27 17:52:47 +08:00
Automerger Merge Worker
76479af125
[automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours am: 49ec2b321b -s ours
...
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee
2020-02-27 09:38:06 +00:00
Automerger Merge Worker
49ec2b321b
[automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours am: 6af789dbd2 -s ours
...
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee
2020-02-27 09:26:38 +00:00
Automerger Merge Worker
2e680226fa
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 6820c6e8f5
...
Change-Id: I80ac06259ee7f5d13ac31f806858239509a83382
2020-02-27 09:20:54 +00:00
Automerger Merge Worker
3b6be20812
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6 am: 6c38423605
...
Change-Id: I6a4580c7c8c67f679d30195a9393dd48263c7f86
2020-02-27 09:20:48 +00:00
Automerger Merge Worker
e30e500acb
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 am: 1c4f76ec18
...
Change-Id: I93e202733dd35bbe87e4bdfa55c34997d159030a
2020-02-27 09:20:42 +00:00
Automerger Merge Worker
6af789dbd2
[automerger skipped] Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828 am: 9ac493094e -s ours
...
am skip reason: Change-Id I8147ec96569fa28867c088d6c36584aa344f40ed with SHA-1 c12b1b40ee
2020-02-27 09:12:29 +00:00
Automerger Merge Worker
6c38423605
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 4a791935a6
...
Change-Id: Id1c73a5a0faab9cfa7089cee7be81a35325eefbe
2020-02-27 09:08:13 +00:00
Automerger Merge Worker
1c4f76ec18
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866
...
Change-Id: I86ded0cbe8c2b3960c7df9d4baeb14cc26a38e2f
2020-02-27 09:07:55 +00:00
Automerger Merge Worker
6820c6e8f5
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866
...
Change-Id: I322771c42e3890b57e3fa4b72f56023c0096c875
2020-02-27 09:07:54 +00:00
Automerger Merge Worker
9ac493094e
Merge "Fixes ApnEditor not restoring previous UI" am: cd4ca97828
...
Change-Id: I20438b787bb2424cc4455c476e5f6bd95d559d87
2020-02-27 09:02:56 +00:00
Automerger Merge Worker
4a791935a6
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
...
Change-Id: If2e85409f09d02876a496af93f76a2753e493da9
2020-02-27 08:55:25 +00:00
Automerger Merge Worker
554b10a866
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
...
Change-Id: I4947e650122998b51413fc81397a6728f9ef837b
2020-02-27 08:55:13 +00:00
Treehugger Robot
cd4ca97828
Merge "Fixes ApnEditor not restoring previous UI"
2020-02-27 08:50:37 +00:00
TreeHugger Robot
2f492604e5
Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev
2020-02-27 08:41:57 +00:00
