Automerger Merge Worker
6a9d3f659e
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4 am: d28ca51a44
...
Change-Id: Ifac8dabae4d17a3585ca15ee35d943c17e01461a
2020-03-10 13:27:04 +00:00
Automerger Merge Worker
e5a9590eb5
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 am: 5c9b3e86ff
...
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
2020-03-10 13:26:54 +00:00
Automerger Merge Worker
d28ca51a44
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4
...
Change-Id: I1593b59c5bb38a923f7127b7828c8de8ae684b5a
2020-03-10 13:10:14 +00:00
Automerger Merge Worker
5c9b3e86ff
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9
...
Change-Id: Ib34b506d8394fb60aeac8c9c18a5fa3ecae2fdc6
2020-03-10 13:10:08 +00:00
Automerger Merge Worker
b5ee8d3119
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3
...
Change-Id: I0e5d07cd7c690eef446ff0c49ded2ced37478706
2020-03-10 13:10:06 +00:00
Automerger Merge Worker
5c874710a3
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50
...
Change-Id: Id7b516abb8e8f01bdf0eff32359925e8c517cd56
2020-03-10 12:43:45 +00:00
Automerger Merge Worker
dbb18e85e4
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22
...
Change-Id: Iec3c9cfebc740ec2b04ff315fc6e18282ccaa8bd
2020-03-10 12:43:44 +00:00
Automerger Merge Worker
8cab6d80f9
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50
...
Change-Id: I7c442aa3e7976fa0c8647108e14e02006286f0b8
2020-03-10 12:43:31 +00:00
Automerger Merge Worker
0a6442df22
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340
...
Change-Id: I5620a3a5c637aa142b3aa04f7b2a881f3e21ca76
2020-03-10 12:29:00 +00:00
Automerger Merge Worker
9bc76d1b50
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340
...
Change-Id: I5a5b4379c819f83bdc2296e2f0e4d1efb2479987
2020-03-10 12:28:50 +00:00
TreeHugger Robot
7c2979c340
Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev
2020-03-10 12:12:46 +00:00
calvinpan
75867d8f63
Hide the 5G opiton when 5G has been disallowed
...
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.
2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).
Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest
Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c
[Wi-Fi] Add STA+AP information in Hotspot & tethering footer
...
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.
Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
2020-03-10 18:15:13 +08:00
Automerger Merge Worker
d93bbd6686
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 am: e7b21c94f1 am: 3a1a3b43b7
...
Change-Id: I3da298361c8f9e626b46551c8715bfb57d2c4679
2020-03-10 09:15:04 +00:00
Automerger Merge Worker
24f8522dff
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f am: 857f165afc am: 95f0e15ec9
...
Change-Id: I721b9d9b8de862d896397c2bede3684954baf880
2020-03-10 09:14:57 +00:00
Automerger Merge Worker
12be2708fc
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4 am: 169c70e586 am: feac85c7b0
...
Change-Id: I408dda2634c215d6c21841c2c458407fff7c0625
2020-03-10 09:14:51 +00:00
Automerger Merge Worker
70ce4b94b8
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 am: 0f2e2a664c
...
Change-Id: Ia1f4e16be17426e968503011d0a52ad8ff5aeab6
2020-03-10 09:14:34 +00:00
Automerger Merge Worker
8f218955ec
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: d702b2a8b6 am: bf7d11549a
...
Change-Id: Ib2327815e193277e259ae014bb1536f41a56d970
2020-03-10 09:14:12 +00:00
Automerger Merge Worker
3a1a3b43b7
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61 am: e7b21c94f1
...
Change-Id: I16c6c1edc21d4a55a1018199dfbc2bb5c4dc0634
2020-03-10 09:13:18 +00:00
Automerger Merge Worker
95f0e15ec9
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f am: 857f165afc
...
Change-Id: Icc0a8b927050272b7a1c3488315a31f8da6affbd
2020-03-10 09:13:13 +00:00
Automerger Merge Worker
07294f8c42
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 am: 0ed90e5f4c am: b9289da489
...
Change-Id: I6f170f8240293e906ea3ed44c8f318fd87541f92
2020-03-10 09:12:52 +00:00
Automerger Merge Worker
feac85c7b0
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4 am: 169c70e586
...
Change-Id: I128cc6d56d178e8e2a72342bf9e5bd95f875eab5
2020-03-10 08:58:06 +00:00
Automerger Merge Worker
0f2e2a664c
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37
...
Change-Id: I1d1ce0c67def33d4ce62e73e7fe408b6b56174e2
2020-03-10 08:58:01 +00:00
Automerger Merge Worker
bf7d11549a
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: d702b2a8b6
...
Change-Id: Ie91c534a08650f82577907efa66c088e477066fe
2020-03-10 08:57:40 +00:00
Automerger Merge Worker
e7b21c94f1
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: 03e6686a61
...
Change-Id: If8ad476347207f711b2e09b9ff50bee896a2b2ab
2020-03-10 08:57:12 +00:00
Automerger Merge Worker
857f165afc
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b am: 4a76ef4d6f
...
Change-Id: I1dc3e269ffe76c98b595fa7cc906a2c9b516c90e
2020-03-10 08:56:51 +00:00
Automerger Merge Worker
b9289da489
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 am: 0ed90e5f4c
...
Change-Id: Ib2da2909f3bd459eb6cf73650641f3e5969c81af
2020-03-10 08:56:16 +00:00
Automerger Merge Worker
169c70e586
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4
...
Change-Id: Ie1bbac5e828f4babf4ea40ca874faa2fd4bdb63d
2020-03-10 08:40:07 +00:00
Automerger Merge Worker
03e6686a61
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596
...
Change-Id: Iec81a0116b36372b0a99975e02a3f9a1133d4379
2020-03-10 08:39:51 +00:00
Automerger Merge Worker
fa923a5e37
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596
...
Change-Id: I7b3e83bd105dcede447fde3037f4b4737a5cbde1
2020-03-10 08:39:49 +00:00
Automerger Merge Worker
d702b2a8b6
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b
...
Change-Id: I51c7b230702e07cb4b0e540ec0a5cd2bad2acd5a
2020-03-10 08:39:35 +00:00
Automerger Merge Worker
0ed90e5f4c
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0
...
Change-Id: I914c8c9c5d8f1d47777d02c8d3923831fdf5e6af
2020-03-10 08:38:07 +00:00
Automerger Merge Worker
4a76ef4d6f
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b
...
Change-Id: If11cc848c81c5756e05f945a843cb7b1e29e62de
2020-03-10 08:37:58 +00:00
Automerger Merge Worker
ef43ab8f2a
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: 9502c9ccc8 am: 91f69f1cf6 am: 767f66cf4d
...
Change-Id: I18dc455cf3213094661ebe15eefe20e841b69fbc
2020-03-10 08:31:33 +00:00
Automerger Merge Worker
db84d34993
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677 am: fa77897db0 am: bd6b8efb90
...
Change-Id: I883e9a6732f1a771fc441de2d2fc4f5998d7a1d5
2020-03-10 08:31:06 +00:00
Automerger Merge Worker
767f66cf4d
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: 9502c9ccc8 am: 91f69f1cf6
...
Change-Id: I40e9def177b45a0fbae9743530f4f7ccf15dd1e2
2020-03-10 08:30:55 +00:00
Automerger Merge Worker
00e3d66465
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: e1d122c3a0 am: 8c1731910a
...
Change-Id: Idbbff6f0a6ca03c43bca3e2f9864ccd1029d606e
2020-03-10 08:30:53 +00:00
Automerger Merge Worker
f6a24c2596
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388
...
Change-Id: I55dc5ee5c67bbb270278fb7f66a70121e46d21a0
2020-03-10 08:30:41 +00:00
Automerger Merge Worker
cbc146d3f4
Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388
...
Change-Id: I8c47d8c3dea5b3f816facdc4775d8653fc0c01d6
2020-03-10 08:26:07 +00:00
Automerger Merge Worker
48d161b7b0
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4
...
Change-Id: Ic0758e620662f68ee614e4478e26bad1468b0c70
2020-03-10 08:25:59 +00:00
TreeHugger Robot
e5110e9388
Merge "Change sticky card UI back to homepage card style" into rvc-dev
2020-03-10 08:25:47 +00:00
Automerger Merge Worker
f77dab373b
Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4
...
Change-Id: Ia4190bdf239718b0b4600d1e3196b09be0736441
2020-03-10 08:25:10 +00:00
Automerger Merge Worker
bd6b8efb90
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677 am: fa77897db0
...
Change-Id: Ib9a4757291bdf903a0afeb6a2166befa6283ef1e
2020-03-10 08:19:23 +00:00
Automerger Merge Worker
8c1731910a
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: e1d122c3a0
...
Change-Id: Icbc30aa9ab5063be26b2b7e103908cc842011d7e
2020-03-10 08:19:15 +00:00
Automerger Merge Worker
91f69f1cf6
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: 9502c9ccc8
...
Change-Id: I3a6481e24fe92efe794810b5b6a9551de008e20f
2020-03-10 08:18:50 +00:00
tim peng
378ca1dac4
Merge "Add entry point at output switcher to do group operation" into rvc-dev
2020-03-10 08:07:43 +00:00
Automerger Merge Worker
fa77897db0
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677
...
Change-Id: Iad6655015c233c588e7fc01e5d9e884cf66b4745
2020-03-10 08:04:19 +00:00
Automerger Merge Worker
e1d122c3a0
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc
...
Change-Id: I64748c07ef3dbd2cdaa81169e781fca20ee08112
2020-03-10 08:04:12 +00:00
Automerger Merge Worker
9502c9ccc8
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc
...
Change-Id: I86dba93e2ddb81fd3c1fe458a1fe1091dca3969c
2020-03-10 08:03:59 +00:00
Automerger Merge Worker
fd12e2e677
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e
...
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
2020-03-10 07:44:09 +00:00
