Arc Wang
0a45c4099d
[Wi-Fi] Fix 2 Wi-Fi shortcuts bug
...
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.
Bug: 151133236
Test: manual
Home context menu -> Widgets -> Settings shortcut
Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
2020-03-11 15:41:13 +08:00
Automerger Merge Worker
e740596789
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
am: 423c789130
...
Change-Id: I08b8fd741fdebd4caa5f354ddbc14fcfe5c1a0f3
2020-03-11 04:54:19 +00:00
Automerger Merge Worker
423c789130
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
am: cb9cfc19c3
...
Change-Id: Ic33bc4574017d972cd4007ab25373c9b6443652e
2020-03-11 04:34:11 +00:00
Automerger Merge Worker
cb9cfc19c3
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
...
Change-Id: I0764e99d5970a34f7cf3a01665870123151a94f5
2020-03-11 04:20:12 +00:00
Arc Wang
b8fb854e98
Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev
2020-03-11 04:00:49 +00:00
Automerger Merge Worker
579a1462a0
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
am: a4f49c2211
...
Change-Id: Ib3dd9cf888c4de1c29d193bc4f606fb256b6d9e9
2020-03-11 04:00:13 +00:00
Automerger Merge Worker
a4f49c2211
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
am: 88321847f2
...
Change-Id: Id257eb221584b0236ca15ed49486419979a8e828
2020-03-11 03:46:30 +00:00
Automerger Merge Worker
88321847f2
Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
...
Change-Id: I56111d64a362e93fae8ff5b12af7f12e53bfc043
2020-03-11 03:33:13 +00:00
TreeHugger Robot
6aa40f6ea7
Merge "Revert "Ignore some failed tests."" into rvc-dev
2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504
Revert "Ignore some failed tests."
...
This reverts commit db4fd2b1c3
.
Reason for revert: Test failures are fixed.
Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
Automerger Merge Worker
c8ec6b0fd6
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
am: e09cffdfdb
...
Change-Id: I36b5bbba5da4c9983643af41629e06c83faa90d6
2020-03-11 01:07:11 +00:00
Automerger Merge Worker
e09cffdfdb
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
am: b56ca208d9
...
Change-Id: I8c71ba4fec4304dbb8d5370c0f71c0ec8202a93d
2020-03-11 00:54:35 +00:00
Automerger Merge Worker
b56ca208d9
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
...
Change-Id: I1f920eab1476d7365ea1cac9fd680f4b2aa56637
2020-03-11 00:42:55 +00:00
Quang Luong
bff2347964
Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev
2020-03-11 00:31:29 +00:00
Kevin Chyn
59834e6bf4
Partial revert of ag/10482633
...
SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.
Fixes: 151058692
Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692
2020-03-10 17:26:26 -07:00
Christopher Tate
36f182159f
DO NOT MERGE - Track framework changes to crashApplication
...
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
Automerger Merge Worker
9a71912db6
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
am: 2cec639f03
...
Change-Id: Ibe4f5cd65b531f0b26a38cdef0227b1b482d4987
2020-03-10 17:31:59 +00:00
Automerger Merge Worker
2cec639f03
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
am: 17718f979a
...
Change-Id: I0d35897985d9ab4506971bb75c5d4b614efedb4c
2020-03-10 17:19:23 +00:00
Automerger Merge Worker
17718f979a
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
...
Change-Id: I4421beef3f7468b58d3b83c444fcebaf1a758d83
2020-03-10 16:58:22 +00:00
Nathan Harold
a8bee76d11
Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev
2020-03-10 16:35:02 +00:00
Automerger Merge Worker
90d62de46c
Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
am: 2f2d8d5949
am: 548a47fa63
...
Change-Id: I4d1b553a81bce90ca9dea5d93935012378fc45b4
2020-03-10 15:41:15 +00:00
Automerger Merge Worker
548a47fa63
Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
am: 2f2d8d5949
...
Change-Id: I0bae6ab0e8783f46f189ec7eb7bdd8c2e739f1ef
2020-03-10 15:16:06 +00:00
Automerger Merge Worker
2f2d8d5949
Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
...
Change-Id: I4bfd5350cbf0365770f3504206febce23ef2c09f
2020-03-10 15:02:04 +00:00
TreeHugger Robot
1334a7e986
Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev
2020-03-10 14:45:46 +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
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
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
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
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
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
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
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
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
84098ef1fc
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e
...
Change-Id: Ic9c4c42f792b6eae86939cf66fa7385cb1915091
2020-03-10 07:44:06 +00:00
TreeHugger Robot
b65866968e
Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev
2020-03-10 07:24:52 +00:00
Quang Luong
d0a22bd699
Fix Tx link speed still showing after disconnecting from wifi network
...
Make sure the tx link speed preference in the Network Details page
disappears when the network is disconnected.
Bug: 151126855
Test: manually going to network details page and disconnecting and
verifying that the link speed disappears.
Change-Id: I3dfd66085db987535c201d38961e4bca709752c9
2020-03-10 00:09:52 -07:00
Tim Peng
1a5b896dc2
The text contrast of "disconnected" in Switch media output panel is insufficient.
...
-Apply generic color "textColorSecondary"
Bug: 151050490
Test: manual
Change-Id: Id5e967faab6dedb25607f8afb12acbf338211144
2020-03-10 07:08:24 +00:00
govenliu
6794ce8233
[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page
...
The startActivity API can not launch the help page.
Change to use startActivityForResult to launch.
Bug: 143784389
Test: Add learnMore_launchesHelp_shouldStartActivityForResult unit test to check if startActivityForResult be called.
Change-Id: Ia3ef82f94d4c8feb71131b44be26df74d6259805
2020-03-10 14:28:34 +08:00
Automerger Merge Worker
a766eb7737
Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc
am: b0ef375e6e
am: 292f680b22
...
Change-Id: I55995d98df38ac9d437461f068182487ced3044a
2020-03-10 06:06:00 +00:00
Automerger Merge Worker
292f680b22
Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc
am: b0ef375e6e
...
Change-Id: I2be7496886d6947802b89a3ccc01f8f1d9c0a52f
2020-03-10 05:46:22 +00:00
Tim Peng
b4c4c362c5
Add entry point at output switcher to do group operation
...
-Entry point is available only when there are more than 1 connected device
-Add group Slice item when it is available
-Add intent filter in manifest
-Add test case
Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: If398b7a31219fd1910503d96fe7593622528c792
2020-03-10 13:44:09 +08:00
Automerger Merge Worker
b0ef375e6e
Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc
...
Change-Id: I47f6bd36cba22132097b4926947ee9db3f4a183f
2020-03-10 05:29:57 +00:00
TreeHugger Robot
e28309b2dc
Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev
2020-03-10 05:17:40 +00:00