Automerger Merge Worker
bcd758f57f
Skip QQ2A.200113.001 in stage-aosp-master am: 28f9734a4a
...
Change-Id: Icd30b28c72ab2495737ecd91373ed4b25f1a63aa
2020-02-28 06:10:26 +00:00
TreeHugger Robot
594a5c71f5
Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev
2020-02-28 06:04:46 +00:00
Peiyong Lin
fc4155a02c
Only show graphics driver option when the apk is available.
...
Previously we always show all options, this patch makes the dashboard
only shows the option when the driver apk is available.
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: Ifde5929d826d5ab542e855aa334546dd744b138b
2020-02-28 03:34:02 +00:00
Automerger Merge Worker
05f2b4b1fc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: ed20d772f1
am: 3542ce579c
...
Change-Id: I1a5ac09c7d053537b66712baf227a889eaa2d9d5
2020-02-28 02:13:06 +00:00
Automerger Merge Worker
67792e2a8c
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: 83c6fd40cc
am: 7e5ad900da
...
Change-Id: Iad7ac1fc9ba5f39a0c6575d971c733e23d417294
2020-02-28 02:12:48 +00:00
Automerger Merge Worker
6a2723d3d5
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 47e84d67a9
am: 756ccff52e
...
Change-Id: I5d07fd7f08e9e9801701ce410e7d3ab3139208eb
2020-02-28 02:12:43 +00:00
Automerger Merge Worker
bf5ab39101
Merge "Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
am: 06c880fff2" into rvc-qpr-dev-plus-aosp
2020-02-28 02:12:35 +00:00
Automerger Merge Worker
c6df99a6ba
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: ed20d772f1
am: 4712b73b69
...
Change-Id: Id15fc0d05f2ec14d9e39beedb7f457309127fec4
2020-02-28 02:12:29 +00:00
Automerger Merge Worker
80561dba97
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
am: 06c880fff2
...
Change-Id: Id6776cb2abd233be32f4a45cec534b86d3fd003f
2020-02-28 02:12:26 +00:00
Automerger Merge Worker
2e42539fbf
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
am: d33d2ba23b
...
Change-Id: I880855de41b405107f4991968667ece4ba82023b
2020-02-28 02:12:08 +00:00
Automerger Merge Worker
7e5ad900da
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: 83c6fd40cc
...
Change-Id: I6b19425c69aa6c6939328b8f8386cb8bde0b6bd9
2020-02-28 01:47:45 +00:00
Automerger Merge Worker
3542ce579c
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: ed20d772f1
...
Change-Id: I12634ec0b9ef0bce1b4491820b9f6c3ffaa2648e
2020-02-28 01:47:40 +00:00
Automerger Merge Worker
756ccff52e
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 47e84d67a9
...
Change-Id: I44bdc18cb1dd71215d3ab113d8afb3a23ad9c066
2020-02-28 01:47:37 +00:00
Automerger Merge Worker
06c880fff2
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
...
Change-Id: Iaffbda894d1ec07f467cb97d9dee0ccc5f500e10
2020-02-28 01:47:33 +00:00
Automerger Merge Worker
4712b73b69
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
am: ed20d772f1
...
Change-Id: I115c5148550cea56557affe0a1635f8dd58e203d
2020-02-28 01:47:22 +00:00
Automerger Merge Worker
d33d2ba23b
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
am: 763c41ca36
...
Change-Id: I3b87dd47f3ed334bb03b06221c8128d015180d15
2020-02-28 01:47:14 +00:00
Automerger Merge Worker
83c6fd40cc
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: Ia2925a46fb9f077a388b5ffe1e40f199aab3cb5f
2020-02-28 01:35:49 +00:00
Automerger Merge Worker
ed20d772f1
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9
...
Change-Id: I96b3526fe5e7625c88d2f2d6ba48c9617032fd49
2020-02-28 01:35:36 +00:00
Automerger Merge Worker
47e84d67a9
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I7d2a5b99b74784c9464f6722ffd4b023c337b1d8
2020-02-28 01:35:32 +00:00
Automerger Merge Worker
763c41ca36
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8
...
Change-Id: I06f10f54f84c58071694666a63e3e40dfb8f1ca9
2020-02-28 01:35:30 +00:00
TreeHugger Robot
dc4f004cc9
Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev
2020-02-28 01:31:08 +00:00
TreeHugger Robot
51b06031e8
Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev
2020-02-28 01:28:23 +00:00
Automerger Merge Worker
bf96e8290f
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: cafa42b471
am: e08c48dc07
...
Change-Id: I91b3d5e5b81a48947eb892e4311464e65846ffb5
2020-02-28 00:45:47 +00:00
Automerger Merge Worker
c279547e70
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: eb036399eb
am: 7761f504ec
...
Change-Id: I0a741fc6c4766b4d402cb50886a6a45fa6505f21
2020-02-28 00:44:40 +00:00
Automerger Merge Worker
fe7b3665f5
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: eb036399eb
am: 8715ccf4fb
...
Change-Id: I716906ac12b07da82783c7f91529bd68c14dc2cd
2020-02-28 00:41:29 +00:00
Automerger Merge Worker
e08c48dc07
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: cafa42b471
...
Change-Id: I44de7c62b4b20437e27c25b9875319790ccebec2
2020-02-28 00:36:07 +00:00
Automerger Merge Worker
8715ccf4fb
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: eb036399eb
...
Change-Id: I4ca5c4f5ada31f40e1efb460366833afd06f97ce
2020-02-28 00:34:30 +00:00
Automerger Merge Worker
7761f504ec
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
am: eb036399eb
...
Change-Id: I8470280421e805d398236550a668afa5829c18d6
2020-02-28 00:34:28 +00:00
Automerger Merge Worker
cafa42b471
Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3
...
Change-Id: Idc5e7757dcfc019be48b268f8730541f9cd8706e
2020-02-28 00:27:15 +00:00
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