Commit Graph

219 Commits

Author SHA1 Message Date
Samuel Tan
d54bbd5193 Allow domain suffix match to be set in UI for EAP configurations
Add a "domain" field that allows the user to specify a domain
suffix match for an EAP network configuration. This field
will only be available when the user specifies a CA certificate for
an EAP-PEAP, EAP-TLS, or EAP-TTLS network. Under the hood, the
value entered into this field will be passed to WPA supplicant
as the |domain_suffix_match| configuration variable.

BUG: 25180141
Change-Id: Ib69b9519f475e90e40441ddff61c80be43cf624b
TEST: On angler, domain field appears for the EAP-PEAP, EAP-TLS
TEST: and EAP-TTLS networks.
2016-01-29 15:40:43 -08:00
Samuel Tan
57c329c9f9 Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.

BUG: 26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
2016-01-27 14:10:40 -08:00
Samuel Tan
f827c929dd Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.

Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.

BUG: 26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
2016-01-27 14:10:34 -08:00
Samuel Tan
fffc5936b9 Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.

Also:
- change the wording of the default option for
  EAP CA and user certificates from "(unspecified)" to
  "Please select", to make it obvious that a choice
  needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.

BUG: 26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
2016-01-27 14:10:25 -08:00
Samuel Tan
03a117bcfa Display warning if users does not provide CA cert in EAP config
Display an explicit warning in the WiFi configuration menu if
the user selects the option to not validate the EAP server (i.e.
does not provide a CA certificate) in an EAP configuration.

BUG: 26686071
Change-Id: I73620b60defdcf40865f8c67d5de24b5dad636f8
TEST: Warning appears when the abovementioned option is selected.
2016-01-26 17:45:32 -08:00
Samuel Tan
30f7b5a7cf Add menu options for not specifying a EAP CA cert and User cert
Add the "Do not validate" and "Do not provide" menu
options for not providing a CA certificate and User certificate
respectively for EAP configurations.

Choosing these options are essentially equivalent to leaving
these fields alone as "(unspecified)" (when that option existed),
but now we require the user to make a conscious choice not to
provide these certificates.

BUG: 26686071
Change-Id: I4b9c07528d6d2ba3eb0787e7cfff69d05dd25679
TEST: Both the added options appear in the relevant menus.
TEST: Choosing both these added options in an EAP-TLS configuration
TEST: allows the configuration to be saved.
2016-01-26 17:45:32 -08:00
Samuel Tan
933b6ed98f Disable configuring EAP-TLS without user certificate.
Disallow configuring EAP-TLS without a user certificate,
since this is probably an invalid configuration.

Also:
- change the wording of the default option for
  EAP CA and user certificates from "(unspecified)" to
  "Please select", to make it obvious that a choice
  needs to be made to proceed.
- Fix style issues found in WifiConfigController.java by checkstyle.py.

BUG: 26686071
Change-Id: I7ccfdf40db97328e3297a03cc43033ff2428980f
TEST: Save option is grayed out when configuring EAP-TLS network
TEST: while leaving "User Certificate" left at "Please select".
2016-01-26 17:23:11 -08:00
Sanket Padawe
30e812b731 [DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug: 15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
2016-01-26 16:51:39 -08:00
Rubin Xu
b557817abc resolve merge conflicts of 55d7fcbfc2 to master.
Change-Id: Ib0876ea153e8a8f7c8ad5438915d39c9ae97e51b
2016-01-27 00:34:53 +00:00
Rubin Xu
e34ea11fca Support multiple CA certs when editing a saved Wifi network.
SSID with multiple CA certs can only be added programmtically. However it
can still be edited in the UI by long-pressing the item when currently
connected to the network. This change makes sure the UI shows up with
 meaningful indications that the SSID is configured with multiple CA certs.

Bug: 22547958
Change-Id: I5d42313efb141db521dd09ff3fbc520915b6fb79
2016-01-27 00:25:10 +00:00
Bartosz Fabianowski
1058c0cc3d Allow user to specify whether a new network is shared or private
* Add a check box to the WiFi configuration dialog that lets the user
  choose whether a newly created configuration is shared with other
  users (defaults to true)
* Disable the check box when modifying an existing network

BUG=25600871

Change-Id: Ifc6713602ee61b0407e55f45097c1b311fa19cb4
2016-01-25 18:47:39 +01:00
Jason Monk
39b467482d Depend on support lib preferences
Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
2015-10-13 10:12:20 -04:00
Maurice Lam
771fac591f [WifiSettings] Add Wi-Fi dialog activity
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.

Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:

MODE_VIEW     --  mEdit = false, mModify = *
MODE_CONNECT  --  mEdit = true, mModify = false
MODE_MODIFY   --  mEdit = true, mModify = true

Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
2015-09-17 16:03:49 -07:00
Maurice Lam
2662df8433 [WifiSettings] Submit Wi-Fi dialog with enter key
Add a OnKeyListener for hardware keyboards and an
OnEditorActionListener for on-screen IMEs to submit the Wi-Fi dialog
with the currently entered information.

Before committing the action, check for whether the dialog is
submittable -- that is checking whether all necessary information has
been entered. If not the enter key behaves the same as it is before
the change.

Bug: 22211604
Change-Id: Idede4233a7385d3bcd8fd6614948270280536bf1
2015-09-14 12:07:06 -07:00
Sanket Padawe
a1423547cf Disable configuring EAP-TLS/TTLS/PEAP without CA certificates.
Bug: 15162357
Change-Id: I9b1be9837b104670adc1cc7ed47a5095ff38d335
2015-09-11 01:08:53 +00:00
Sanket Padawe
f1165c14c5 Avoid sending identity along with EAP sim, aka & aka'.
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
2015-08-11 18:42:36 -07:00
Sanket Padawe
3bf0db8d10 Fix issues in AP dialog arising after clicking on AP preferences.
+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7
2015-07-24 13:52:03 -07:00
Sanket Padawe
8c5d5c8c56 Disable CA certificate for EAP-SIM, AKA & AKA'
Bug: 21877800
Change-Id: I66dbb12ebcf94c094d2a71d91d8b2eeef8cf6f48
2015-07-06 16:14:43 -07:00
Sanket Padawe
52dce9d334 Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev 2015-06-28 02:45:48 +00:00
Sanket Padawe
94c0b0d436 Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
Bug: 22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
2015-06-26 15:57:43 -07:00
Shirish Kalele
1bcf050bf0 Use the ephemeral flag in the AccessPoint to mark a
connection as a Wifi Assistant connection.

Change-Id: Ife26f6799a5b9e4640181d150edb7455adf38f0f
2015-06-25 13:56:33 -07:00
Jason Monk
c68b46c1f2 Handle switch of ssid to CharSequence (for spans)
Change to reference the string directly for places like search,
etc.

Bug: 20059794
Change-Id: I3305c9833e8aeea52b968c094d0a1881a3e6699e
2015-06-15 10:09:55 -04:00
Alex Klyubin
3848407d0c Switch from KeyStore.saw to KeyStore.list.
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.

Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
2015-06-08 09:30:08 -07:00
Sanket Padawe
2816e4e3e0 Fix wifi network strings shown in Settings.
Bug: 21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
2015-06-05 18:49:12 -07:00
Sanket Padawe
ecf4339bc7 Fix Eap method selection on screen rotation.
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
2015-05-27 18:04:23 -07:00
Sanket Padawe
b212629d92 Hotspot 2.0 UI for saved network.
Bug: 20182930
Change-Id: I455773f446dad323ed9cb559c2f2d69ca53af46c
2015-05-12 10:26:43 -07:00
Vinit Deshpande
a2fd307651 Implement 'Available via Passpoint' feature [DO NOT MERGE]
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: I152cebafa6259194f1d09a6972a3508156335cb6
(cherry picked from commit 08b5b5d439)
2015-04-29 19:32:50 +00:00
Zoltan Szatmary-Ban
89403529ad Show dialog when user tries to edit a locked down WiFi config
Also, 'FORGET' button is not shown on WifiDialogs of locked down configs.
Context menu only shows 'Connect' for them.

Bug: 20117316
Change-Id: I3fa986c10b6ff47d1a897794213c225c8c6f579b
2015-04-20 16:04:15 +01:00
Prerepa Viswanadham
1d7dc74b45 Merge commit '0507524' into merge_work 2015-04-10 15:43:14 -07:00
Vinit Deshpande
05075242db Enable UI for EAP-SIM/AKA/AKA'
We hide identity field for these; since dynamic
identities are now supported.

Change-Id: I5c6816b005ffbcdfa9aad953f5167d3dfd9de055
2015-03-31 12:36:35 -07:00
Prerepa Viswanadham
77eb8880e8 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Fix build in DevelopmentSettings.java

Change-Id: I8d89fd46482fae8e708398f749e480b8a06f5f03
2015-03-24 19:08:43 -07:00
Sanket Padawe
3eb3b104d7 Restore password visibility on screen rotation in Hotspot/Wifi setup.
Bug: 16237425
Change-Id: I2bf0aaaa657d60f007858c6635d2a17326562c66
2015-03-20 10:07:50 -07:00
Adrian Roos
8481d64e32 Remove obsolete WifiSettingsForSetupWizardXL
Bug: 18405549
Change-Id: I30c7c9ee8f544054b13cfc24f7433bdc1448e339
2015-02-11 15:54:45 +01:00
Jason Monk
fc1b00cfe4 Move some wifi tracking code to SettingsLib
Move tracking of which networks are available/saved and their state
over to SettingsLib to share it with Quick Settings.

Bug: 19180466
Change-Id: Iaeef06b26da8cb38e1ba09a7d105d04d499dc181
2015-02-04 20:40:32 +00:00
Jeff Davidson
06b65d1c7d resolve merge conflicts of 0c7e4ed to master.
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
2014-12-09 15:11:44 -08:00
Jeff Davidson
5ead6b92fd Final platform settings UX for ephemeral networks.
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.

Bug: 18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
2014-12-05 10:14:41 -08:00
PauloftheWest
3969b6b7b2 am c33b2ee3: am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev
* commit 'c33b2ee31acffd9a729351452f5f0d3bbec87dba':
  Fixed a Wi-Fi dialog crash
2014-12-02 18:19:47 +00:00
PauloftheWest
ae680e3c67 Fixed a Wi-Fi dialog crash
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
2014-11-25 12:27:07 -08:00
Sky Faber
ec4ba9b538 User wifi separation feature.
-Enable forget button for all users.

Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
2014-09-27 02:05:47 +00:00
Prem Kumar
c0deb7dac0 Merge "Remove UI for Forget AP as a secondary user." into lmp-dev 2014-09-14 23:51:21 +00:00
PauloftheWest
a7383f3862 Removed connect button from Saved Networks dialog.
Bug: 17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
2014-09-08 16:06:04 -07:00
Sky Faber
073f07f33b Remove UI for Forget AP as a secondary user.
Bug: 16898030
Bug: 17317819
Change-Id: I4ef17483bc1b35f2f70c23eb12d813f029b15bf0
2014-09-04 12:07:41 -07:00
Lorenzo Colitti
f1b786d8a8 Stop using LinkProperties for static configuration.
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
2014-08-19 11:59:44 -07:00
PauloftheWest
fd19aff782 Fixed crash when changing orientation in the Add Networks dialog.
Bug: 16479540
Change-Id: Ib42977b72039f49b5d5ae688c0b0ded1094b44e2
2014-07-30 15:16:38 -07:00
PauloftheWest
b4564c39b7 Applied some minor UI changes (see below)
+ Changed wifi icons to teal
+ Removed “Secured with …” from network status
+ Added an empty state image above text when Wi-Fi is off
+ Removed Wi-Fi Direct and WPS Push button from overflow menu
+ Added Wi-Fi Direct and WPS Push button to Advance Activity
+ Input Password Dialog: Moved Signal Strength and Security to Advance
+ Input Password Dialog: Updated Password text to Material style

BugId: #15698824 #15702808
Change-Id: I542ab9aac2c098738330c92d9183d3907c4f0b38
2014-06-27 12:52:56 -07:00
Robert Greenwalt
51d898fd02 Apply LinkProperties changes.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-08 08:58:42 -07:00
Jason Monk
0485b7c373 Add Editable PAC field to Proxy Configuration
Make PAC URL field not read only but now settable in advanced wifi
configuration options.

Bug: 14885470
Change-Id: I2c647f823d5c8a75b5fbf74434cbf0efcc4c50bf
2014-05-22 13:36:02 -04:00
Lorenzo Colitti
93068f4c15 Move IP config from WifiConfiguration to IpConfiguration.
Change-Id: I5d1189682b13f1088848809604690648d8d9ecca
2014-05-20 12:35:25 -07:00
Jason Monk
e86790c838 Support renaming of ProxyProperties to ProxyInfo
Change-Id: I60621a7155ac2938a54ff466501db9a1013e621b
2014-05-05 12:36:10 -04:00
Jaewan Kim
34dcbefe5c Revert "Refactor IpConfiguration from WifiConfiguration"
This reverts commit 16ff27d3f7.

Change-Id: Ide9c9af358f63a6e73bb2172111929c2022f862b
2014-04-07 08:55:02 +00:00