Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,579 Commits 1 Branch 0 Tags
e7e184fdc8d6039fa48d148eed395adcd6bcf809
Commit Graph

59579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e7e184fdc8 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 am: f3aa88ccf2 
Change-Id: I24caecfcee12f22059d78fe681706aa7ad815b37
 2020-03-11 11:51:06 +00:00
Automerger Merge Worker
59da6a7c05 Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f am: 2df7ee7f0e 
Change-Id: I5f6ac60bbef325bf710978b211b3c6a4ac878c91
 2020-03-11 11:51:01 +00:00
Automerger Merge Worker
fde1a52ad1 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 am: ebe7dcaff8 
Change-Id: I463ce8e41de0f920103b03f7a80d90ef721f82d2
 2020-03-11 11:50:57 +00:00
Automerger Merge Worker
f3aa88ccf2 Merge "Fix NPE when coming back to settings homepage." into rvc-dev am: 21338186d5 
Change-Id: I5cf0e713e0016b1463ba7e7e39628adc3cc407c2
 2020-03-11 11:40:51 +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
2df7ee7f0e Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev am: f9570ad33f 
Change-Id: I7191ca8a3c7c1afcd4472649c11eb19eb0df919d
 2020-03-11 11:34:37 +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
ebe7dcaff8 Merge "Update the OWNER files" into rvc-dev am: a38859b2b7 
Change-Id: I8507db93e0193beb937e6684c18d4fbbdef08c99
 2020-03-11 11:29:06 +00:00
TreeHugger Robot
a38859b2b7 Merge "Update the OWNER files" into rvc-dev 2020-03-11 11:08:21 +00: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
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
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
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
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
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
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
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
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
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
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
Automerger Merge Worker
a29182f550 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 
Change-Id: Ie160b8d0c02db0bf72b35995755ddab10b621ef8
 2020-03-10 03:39:12 +00:00
Automerger Merge Worker
84fb219cb0 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd 
Change-Id: I7bf33f1505ca0ec580b557313b72f934b1f484c5
 2020-03-10 03:20:57 +00:00