Commit Graph

1160 Commits

Author SHA1 Message Date
Eric Schwarzenbach
666d70ea76 Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
am: 5e888ad7b6

Change-Id: I8e6852561bba50ed44d17f52099ebf82becd5433
2017-08-01 00:17:31 +00:00
Ryusuke Sawa
653ef15253 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49
am: 775c1c8eb5

Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
2017-07-27 18:28:17 +00:00
Ryusuke Sawa
775c1c8eb5 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
2017-07-27 18:26:18 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Eric Schwarzenbach
bc1cf7e260 Make only the "Add Network" WifiDialog fullscreen.
Fixes an issue where other instances of WifiDialog were being launched
fullscreen. Creates static methods for creating fullscreen and modal
WifiDialogs to make the style more explicit.

Bug: 63889135
Test: make -j40 RunSettingsRoboTests
Change-Id: I2200b5d7f817b9f69a6abb73bf2c04ea24556d19
2017-07-26 17:04:42 -07:00
Antony Sargent
1c84e34cb5 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
am: c3cd88c302

Change-Id: Ibeca8eb7fd61b0a730dc4c77a80a152d69eba0ca
2017-07-26 16:19:02 +00:00
Antony Sargent
1e69f27a41 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
2017-07-26 16:18:50 +00:00
Antony Sargent
c3cd88c302 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
2017-07-26 11:12:39 +00:00
TreeHugger Robot
9fb7a3b8b4 Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev 2017-07-26 10:53:30 +00:00
Antony Sargent
c00fedc639 Allow open password dialog for wrong-password wifi access points
When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
 it was getting stripped out at build time due to not being used in
 settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
 asserting that we don't end up with multiple entries for the same SSID
 in the access point list when changing the security state for the AP,
 but it was accidentally passing multiple AP's with the same name the
 first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78
2017-07-26 07:00:51 +00:00
Christine Franks
be0ac89704 Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
2017-07-26 02:56:36 +00:00
Christine Franks
a1f56b5faa Merge "Restrict changing wi-fi networks" into oc-dr1-dev
am: a7e10e0316

Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
2017-07-26 02:52:52 +00:00
Christine Franks
a0dd987d20 Restrict changing wi-fi networks
Bug: 31852835
Test: manual - verify unrestricted as regular user, but that a password
is required in demo mode.
Change-Id: I60f95ccbb10ba728b384b9c8c2ae723934fb2928
2017-07-25 13:31:12 -07:00
Eric Schwarzenbach
8bca687691 Merge "Make "Add Network" dialog fullscreen." 2017-07-17 17:42:49 +00:00
Eric Schwarzenbach
c86f5bbd00 Make "Add Network" dialog fullscreen.
Bug: 35324632
Test: manual

Change-Id: Ideac214eb97d774878ee772daca2b7efceba95b4
2017-07-17 08:56:57 -07:00
Eric Schwarzenbach
fbc3eee32a Merge "Change wifi detail buttons to match App buttons." 2017-07-14 23:09:23 +00:00
Fan Zhang
53bf174d30 Use app context to init WifiP2pManager.
Change-Id: Ib1a2ef1c0b8c3e72557aafb68b8b5e8677fbacc7
Fix: 32767308
Test: heapdump
2017-07-14 13:05:23 -07:00
Eric Schwarzenbach
4fefb21547 Merge "Change header of wifi detail page to "Network info"." 2017-07-14 18:06:24 +00:00
Eric Schwarzenbach
f6c0004d91 Change header of wifi detail page to "Network info".
Creates a lifecycle observer to modify the action bar.

Bug: 37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Iff48ed51f533c3b7b2a099f83c3216ae975f061f
2017-07-14 09:16:30 -07:00
Eric Schwarzenbach
eb5ceb94e4 Change wifi detail buttons to match App buttons.
Matches color, size and padding.

Bug: 37252029
Test: manual
Change-Id: Ib0d73d8971eef1ecb234f61fc1bfcf294832e594
2017-07-13 16:13:35 -07:00
Fan Zhang
0d8ae943d2 Bidi wrap ip address in Wifi config settings
Change-Id: Ic1b8a61dbb05abd71170a0b98e7d1b8e604bbdcb
Fix: 63670324
Test: robotests
2017-07-13 13:19:29 -07:00
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
2017-07-11 20:27:39 +00:00
Fan Zhang
62a3220efb Use a grey shade under progress spinner in wifi settings
Change-Id: I1c3fa3a05fe66924989607d73e77ca2616a898e6
Fix: 62545533
Test: visual
2017-07-10 14:46:29 -07:00
Stephen Chen
cb3dfb91e8 Adjust UX for toggles when active scorer is not set.
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-07 11:06:20 -07:00
Sundeep Ghuman
2d1e8a736e Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
am: 4fd8528c2f

Change-Id: Ie183a68e7ae944bad8a2ca3782522afd7f78b74f
2017-07-05 22:43:16 +00:00
Sundeep Ghuman
4fd8528c2f Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
2017-07-05 22:30:22 +00:00
Sundeep Ghuman
d569195299 Use EntityHeaderController in WifiDetailPreferenceController.
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.

Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07:00
Stephen Chen
7e27006a7b Adjust UX for toggles when active scorer is not set.
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40

Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-05 12:29:06 -07:00
Sundeep Ghuman
0a1003a8df Merge "Don't scroll when removing saved networks." into oc-dr1-dev am: 1e561edb45
am: b963c1190f

Change-Id: I389ffac52942e382e145de94c166578d6ead48ad
2017-06-30 00:12:41 +00:00
Sundeep Ghuman
b963c1190f Merge "Don't scroll when removing saved networks." into oc-dr1-dev
am: 1e561edb45

Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f
2017-06-30 00:04:37 +00:00
Sundeep Ghuman
1e561edb45 Merge "Don't scroll when removing saved networks." into oc-dr1-dev 2017-06-29 23:56:51 +00:00
Shunta Sato
6d1bb15f3b Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev am: 9638e020e5
am: 97419f8d52

Change-Id: I06a7a62ca94104bc0b108df1fa53660453a95375
2017-06-29 20:42:16 +00:00
Shunta Sato
97419f8d52 Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
am: 9638e020e5

Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
2017-06-29 20:38:03 +00:00
TreeHugger Robot
9638e020e5 Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev 2017-06-29 20:31:18 +00:00
Sundeep Ghuman
14cc864122 Don't scroll when removing saved networks.
Bug: b/62374459
Test: Open saved networks from WifiSettings. Remove a saved network.
Screen should not scroll to the top of the list.

Change-Id: Ia78fc0b5435f659c8fe31abee8b76006d7986b66
2017-06-28 20:27:15 -07:00
Shunta Sato
22080a1df5 Fix Wi-Fi list adds same AP repeatedly
When switch AP security mode, several same APs are shown.

To fix this issue, append security type to preference
key for avoiding different APs have same key.
git fetch

Cherrypick of:
https://partner-android-review.googlesource.com/#/c/799829/

Bug: 37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I39621636f14b29e45ba96ff76dc3c21a4996a136
2017-06-28 20:21:46 -07:00
Sundeep Ghuman
77a58c7b8c Merge "Scroll to top when connecting to network." into oc-dr1-dev am: ea3d314a10
am: 9ff2435ebc

Change-Id: Ia9041ca6f1a3fcfc707b9e3f93a06a1612226606
2017-06-28 23:40:33 +00:00
Sundeep Ghuman
9ff2435ebc Merge "Scroll to top when connecting to network." into oc-dr1-dev
am: ea3d314a10

Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
2017-06-28 23:36:12 +00:00
Sundeep Ghuman
eb41c8cf15 Scroll to top when connecting to network.
Bug: b/34093572
Test: Open wifi picker. Select new network. Picker should scroll to top
of list to display the connected access point category.

Change-Id: Ie555f076a62e8cb589f8c6157d628b345cd84a4c
2017-06-26 16:57:27 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Andrew Sapperstein
4bac421538 Remove logic for adding a search icon to action bar. am: a2dd9978d4
am: a7dd97a4c9

Change-Id: I4e1f2e9e792642257f538696afe8f9aca396cdbb
2017-06-25 23:14:45 +00:00
Andrew Sapperstein
a7dd97a4c9 Remove logic for adding a search icon to action bar.
am: a2dd9978d4

Change-Id: Ifbc919113e129e997d20a89069e159fc5963ee1c
2017-06-25 23:12:44 +00:00
Andrew Sapperstein
a2dd9978d4 Remove logic for adding a search icon to action bar.
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.

Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes: 62230804
Bug: 37477506
Test: robotests
2017-06-25 13:51:08 -07:00
Shinji Sogo
1bed022001 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5 am: 879fd4b406
am: d6db6d8938

Change-Id: I0d270d27a3f8b5050c9b14519bec16e2937ce12e
2017-06-16 19:13:22 +00:00
Shinji Sogo
d6db6d8938 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
am: 879fd4b406

Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
2017-06-16 19:06:38 +00:00
Shinji Sogo
879fd4b406 Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146
am: 27ca1272a5

Change-Id: I70f81796a7c29c416729cc7fd7b4fd8150fdc981
2017-06-16 19:00:18 +00:00
Sundeep Ghuman
0c02e22c99 Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am: 683a7e2bf5

Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
2017-06-15 06:39:40 +00:00
Sundeep Ghuman
f4bee3bb18 Allow WifiSettings to show old APs on app resume. am: 4ae59dde43
am: 6ab460c354

Change-Id: I1f3b7d405ea6e98d4cfa0a69b4468494f7867d4a
2017-06-15 04:24:26 +00:00
Sundeep Ghuman
60b814ba43 Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.

Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/2409026).

Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.

Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
2017-06-14 19:07:05 -07:00