Commit Graph

59567 Commits

Author SHA1 Message Date
Automerger Merge Worker
d6c0f379c5 Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
Change-Id: I8d0ebe9a4b6c2acb19b8e1fc9003d85cf4818faf
2020-03-11 13:29:29 +00:00
TreeHugger Robot
11dbe14584 Merge "Fix TetherSettingsTest" into rvc-dev 2020-03-11 13:12:56 +00:00
Automerger Merge Worker
fd3293d1db Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4
Change-Id: I2193e15b508b9c2c5186afb2afa186d8d3f690fd
2020-03-11 12:57:15 +00:00
TreeHugger Robot
16a7ba81f4 Merge "Tweak strings for assist app" into rvc-dev 2020-03-11 12:38:44 +00:00
Automerger Merge Worker
01a0945e36 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5
Change-Id: I93e4bb5a6504c40bd708da9a461f0b8414838971
2020-03-11 11:41:00 +00:00
TreeHugger Robot
21338186d5 Merge "Fix NPE when coming back to settings homepage." into rvc-dev 2020-03-11 11:40:02 +00:00
Automerger Merge Worker
a3b983560b Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f
Change-Id: I3fd8ec7621579ec4530cb0e37b9f8cfae72b737e
2020-03-11 11:34:48 +00:00
TreeHugger Robot
f9570ad33f Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev 2020-03-11 11:32:12 +00:00
Automerger Merge Worker
818e26464d Merge "Update the OWNER files" into rvc-dev am: a38859b2b7
Change-Id: Ia773a05c5375a17f8745dd2edf41f7ecf6f20151
2020-03-11 11:29:17 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00:00
Tsung-Mao Fang
a5da81db36 Tweak strings for assist app
Follow up the new Assist app string updates.

Bug: 151193605
Test: build and see this page.
Change-Id: Ibbc51cd282c6ae0f9ef1722c33688f21e0c78da7
2020-03-11 10:22:09 +00:00
Yi-Ling Chuang
542f76a51e Fix TetherSettingsTest
Fixes: 151204777
Test: run TetherSettingsTest
Change-Id: Ic510aac7fc7f9af095e78473bc191a4e903dcaba
2020-03-11 18:18:36 +08:00
Yi-Ling Chuang
a591d7a082 Fix NPE when coming back to settings homepage.
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.

Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
2020-03-11 16:52:44 +08:00
Sunny Shao
3d3757683c Update the OWNER files
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
2020-03-11 16:45:14 +08:00
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
020efc050a [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I62f64918ee1bf00cad66f117b400c4404f7e7996
2020-03-11 06:04:38 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
2020-03-11 05:51:49 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Automerger Merge Worker
489d671497 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
2020-03-11 04:20:28 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
2020-03-10 21:12:25 -07: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
18bc0af360 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
Change-Id: I6ba6d60334ef3bdd9a873ae5435f6757789f7842
2020-03-11 03:33:24 +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
e9711ca347 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: I9079a3807c1d493ccc3cba4e188db11da94eeaaa
2020-03-11 02:20:11 +00:00
Automerger Merge Worker
d0d3fd6457 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Automerger Merge Worker
6e0521fefd Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
Change-Id: I69e1948eef5f572f6de11f2a6ef8021970d85924
2020-03-11 00:43:56 +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
Automerger Merge Worker
bb25e17d43 [automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history

Change-Id: I6373b613d7555c796ceaed8469e57ddcc4d5fe60
2020-03-10 21:01:16 +00:00
Automerger Merge Worker
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
2020-03-10 17:47:07 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
ae0bd4256f [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history

Change-Id: I36220a7c22556640143212703a277955452a0ceb
2020-03-10 17:20:19 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
2020-03-10 16:59:32 +00:00
Automerger Merge Worker
43c4fa35da Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
2020-03-10 16:58:34 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
2020-03-10 15:02:13 +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
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
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
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
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
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
fd12e2e677 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
2020-03-10 07:44:09 +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