Commit Graph

659 Commits

Author SHA1 Message Date
Emily Bernier
ff7c75cd17 am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity" into lmp-mr1-dev
automerge: 7a3b253

* commit '7a3b253f086150ab030db967862002795a29bb83':
  Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
2014-12-10 22:28:17 +00:00
Emily Bernier
50ac12e222 Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivity
In some cases, NETWORK_STATE_CHANGED_ACTION broadcasts are sent before
the current network state has been updated in ConnectivityService. Listening
for CONNECTIVITY_ACTION broadcasts as well ensures that we properly catch
new connections and auto-advance appropriately.

Bug: 18503725
Change-Id: Ia414d57d196d09171342fb3ae93c7e826cb1a1aa
2014-12-09 20:02:41 -05: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
fc6a8bf2d7 Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev 2014-12-02 17:58:24 +00:00
Maurice Lam
2bb84de81f am 62009bf8: am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons position in Skip dialog" into lmp-mr1-dev
* commit '62009bf8564accddf97ef3dbf6c90ae9286ea07c':
  [WifiSetup] Swap buttons position in Skip dialog
2014-12-02 06:46:56 +00:00
Maurice Lam
ab4fb49ab1 [WifiSetup] Swap buttons position in Skip dialog
According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.

Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57
2014-12-01 12:09:10 -08:00
Maurice Lam
66e911fb02 am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit 'edfc6a0a5fb4d371272e4b4c80de22c4ff346214':
  [Setup] Theme ChooseLockGeneric for setup wizard
2014-11-26 19:56:48 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
PauloftheWest
ae680e3c67 Fixed a Wi-Fi dialog crash
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
2014-11-25 12:27:07 -08:00
Jeff Davidson
a1aba5484b am 13259fd3: am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev automerge: 0ae8d5c
* commit '13259fd3a1666018328a45095cca5918a7c297d0':
  Final UX for Wi-Fi assistant platform settings.
2014-11-15 03:09:14 +00:00
Jeff Davidson
ce32b21727 Final UX for Wi-Fi assistant platform settings.
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.

Bug: 13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
2014-11-14 15:27:21 -08:00
vandwalle
45e7a93e95 am bf1dcec1: Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b automerge: 4f2c003
* commit 'bf1dcec15f95ce785b78a0657fd601879f1b1135':
  dont blacklist wifi config that have had validated internet status in the past
2014-11-12 03:45:33 +00:00
vandwalle
53ad50b05b Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev 2014-11-12 01:18:38 +00:00
Jeff Davidson
f9c285896c am a8b154f2: am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
* commit 'a8b154f2f04c6130a65c0b45947e01a896e47cd9':
  Don't allow secondary users to change Wi-Fi assistants.
2014-11-10 17:50:08 +00:00
vandwalle
8be7ee3aac dont blacklist wifi config that have had validated internet status in the past
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
2014-11-07 19:01:58 -08:00
Jeff Davidson
739ae972d0 Don't allow secondary users to change Wi-Fi assistants.
This is not ideal but better than the current situation given that the
rest of the connectivity stack does not properly support multi-user.

Bug: 17320659
Change-Id: Ia0d4c746b4ebe6ce90df7ff39f0398ca78fd61f6
2014-11-07 13:26:56 -08:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card.
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
2014-11-07 04:12:59 +00:00
Jeff Davidson
99f191f585 Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.

Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
2014-11-06 13:30:34 -08:00
Jeff Davidson
3959e9b933 am 7b17e24d: am a9086ee9: Show accurate connection status for ephemeral networks. automerge: b46a919
* commit '7b17e24d36e5fd3263204a4ee666e85a4a006b90':
  Show accurate connection status for ephemeral networks.
2014-11-06 02:27:33 +00:00
Jeff Davidson
b46a9194fe Show accurate connection status for ephemeral networks.
Configurations for these networks are not returned in
getConfiguredNetworks() and likely shouldn't be as clients of this API
would not expect them. (Note also that the ephemeral bit is marked
@hide). But the framework may connect to them regardless.

In these cases, as long as the connection status is something other
than the coarse-level DISCONNECTED, we show the status to be an
accurate representation of Wi-Fi state. (To make this possible, we
pass around the full NetworkInfo instead of just the DetailedState,
allowing us to get the coarse state where needed).

When long pressing on a non-DISCONNECTED ephemeral network, we offer
the ability to save the configuration. (Note that this flow is
currently broken and being tracked by another bug, but the behavior is
consistent with what happens when you simply click on the SSID).

Bug: 18205278
Change-Id: I30592c89546068c796f458a86bb26eb3b28c64df
2014-11-05 15:04:14 -08:00
vandwalle
e2ebb88560 am 68421fd5: am e1cb279f: am 508a693c: Merge "sanitize strings and error messages in wiFi picker" into lmp-mr1-dev
* commit '68421fd5c66d2c14ffddc989ccb2815c4da74352':
  sanitize strings and error messages in wiFi picker
2014-11-04 20:23:28 +00:00
vandwalle
b245731e88 sanitize strings and error messages in wiFi picker
Change-Id: I642e79b40902bb45a503be949dea6a09d94b3bc8
2014-11-04 12:05:30 -08:00
Jason Monk
d920bd0819 am ca063736: Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev automerge: 496b3f6 automerge: 3caba72
* commit 'ca063736e98decbf14d876dd90689d02cb18eaa2':
  Allow QS to launch adding network dialog
2014-10-28 19:44:28 +00:00
vandwalle
5e62773362 am 64186866: Merge "prettify debug informations" into lmp-mr1-dev automerge: 10a4cac automerge: 1260451
* commit '64186866c4fffa670543118c2e0fd95df4954362':
  prettify debug informations
2014-10-28 19:44:27 +00:00
Jason Monk
496b3f6471 Merge "Allow QS to launch adding network dialog" into lmp-mr1-dev 2014-10-28 18:45:24 +00:00
Jason Monk
36760c108b Allow QS to launch adding network dialog
This allows QS to set an extra that will launch the adding network
dialog directly for a specified ssid.  It will be used to take users
straight from QS to the password entry, when a secure network is
selected.

Bug: 17722817
Change-Id: I570596af906de005c505678b539f915c06e6fd14
2014-10-28 13:21:12 -04:00
vandwalle
30ac117228 prettify debug informations
Change-Id: I8e5c982f882a333e3f5ffdde6418447572547ea5
2014-10-26 14:15:33 -07:00
John Spurlock
d00c39c5c0 am 27b64086: am 8d6d8f02: am 27334dbe: Settings: Fix hotspot switch state issue.
* commit '27b64086fdf6a219c3f66f6c57ad3e4bb3dcc575':
  Settings: Fix hotspot switch state issue.
2014-10-17 16:46:33 +00:00
John Spurlock
27334dbe75 Settings: Fix hotspot switch state issue.
Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
2014-10-17 11:55:26 -04:00
Fabrice Di Meglio
e4e24ee798 am 8b5b47bf: am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '8b5b47bf4521164381476c0ca5a8dc40bbd8cf5a':
  Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-16 21:54:38 +00:00
Fabrice Di Meglio
667695eb11 Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev 2014-10-16 21:40:03 +00:00
Fabrice Di Meglio
daef2e2b06 Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert more CheckBoxes to Switches

Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
2014-10-15 19:00:35 -07:00
vandwalle
d2aa13d319 am 74e79a96: am 74be17ed: am 7d89e294: am 52e929a9: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
* commit '74e79a96804c4a6309e61f2675170ea4562fe9a7':
  dont show a config in saved network if it is self added and we never connected to it Bug:17939405
2014-10-14 22:25:48 +00:00
vandwalle
426005a299 dont show a config in saved network if it is self added and we never connected to it
Bug:17939405

Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
2014-10-13 18:44:21 -07:00
PauloftheWest
6e07d41a7e am 3708cce5: am e03d52be: am 6a662321: am 0c74ea6c: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '3708cce50598bf5855178c1b7ed8dca58fd95452':
  Fixed a crash when rotating a WPS dialog.
2014-09-29 19:44:12 +00: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
Vinit Deshpande
d7d604056b Merge "Separate wifi AP added by applications." 2014-09-27 02:01:13 +00:00
Sky Faber
2d657e3629 Separate wifi AP added by applications.
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d
2014-09-27 02:00:36 +00:00
PauloftheWest
a7d31e8164 Fixed a crash when rotating a WPS dialog.
Bug: 17635632
Change-Id: Ibd4497362dc61a2f82c098889145430740207638
2014-09-25 12:36:09 -07:00
vandwalle
fb075455bd correctly report DHCP failures
Change-Id: I7a77da83dfb91d42ae18c54ae369ee8756e8f4d6
2014-09-23 13:04:09 -07:00
PauloftheWest
4da0e819ee Fixed a Settings crash when exiting Wi-Fi Settings.
Bug: 17600287
Change-Id: Id2d35e450798785db8e485972036483946f67ef3
2014-09-22 15:12:13 -07:00
Vinit Deshpande
9a8c58d49d Merge "Fix automatic Wi-fi toggle" into lmp-dev 2014-09-19 18:21:57 +00:00
Maurice Lam
27d74fa288 Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev 2014-09-16 18:35:39 +00:00
Maurice Lam
610fdf3343 [WifiSetup] Update connection state for auto-finish
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
2014-09-16 11:05:28 -07:00
Vinit Deshpande
e2c1d504fc Fix automatic Wi-fi toggle
It is happening because there previous view doesn't disconnect
itself from setting change; and then two views alternatively
enable/disable wifi.

Bug: 17157005

Change-Id: I42916a7bbd735960a26efbae670c9b927ec8574d
2014-09-15 20:18:35 -07:00
PauloftheWest
f4b548c0f5 Removed all references to "Google Wi-Fi Assistant" from Settings.
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
2014-09-15 09:31:56 -07: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
Vinit Deshpande
8a7cd97457 Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
This change removes requirement that sender has this permission for
protected broadcasts (since they can only come from framework)

Bug: 17409667

Change-Id: I3431c20a4ed28b3ba2bfc3cf53772e63a3424a2c
2014-09-10 18:38:26 -07:00