Commit Graph

526 Commits

Author SHA1 Message Date
Irfan Sheriff
f027ce5e02 Add static IP UI
Remove the existing UI and add per network static IP config option

Change-Id: I9b8636e1559de9691144fdb54e20d40985896650
2010-09-14 17:02:21 -07:00
Daisuke Miyakawa
a41a9286ab Remove unnecessary comment.
Change-Id: I4532a3b042f3dfee4f1a1fe3c26111ed8b00d023
2010-09-12 20:35:06 -07:00
Daisuke Miyakawa
9c602c4789 Fragmentize TetherSettings and WifiApSettings.
PreferenceScreen for BT tethering isn't fragmentized yet.
We'll need to do so in the near future.

Change-Id: I5a84fecaf84d55b59b6efa8151f2549ad37ca5db
2010-09-10 12:07:58 -07:00
Daisuke Miyakawa
5cd60eb8aa Add modifications which should have been in the change
I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
2010-09-01 19:38:23 -07:00
Daisuke Miyakawa
d36699282c Add Wifi Setup screen for Setup Wizard with XL size screen.
* Add WifiSettingsForSetupWizardXL as a new Activity
The activity has WifiSettings fragment in it. It also contains
several buttons, texts around the fragment.

* Making configuration UI part of Preference list.
In Wifi Setup for Setup Wizard XL, WifiSettings fragment lets
a UI for configuring access points shown inside a
PregerenceCategory object, while it has been shown as Dialog.

To achieve this action, WifiDialog is decomposed into two parts:
- WifiConfigUiBase (Mainly UI part)
- WifiConfigController (Mainly Wifi controller part)

All codes for wifi configuration in WifiDialog is now in
WifiConfigController, which is reused from
WifiConfigPreference.

* Misc stuff
- Remove AccessPoint#compareTo(). Instead,
  AccessPoint.AccessPointComparater should be used when needed.

Change-Id: I520d690d3301837d32f91dad54a973a379ce1989
2010-09-01 16:17:51 -07:00
Daisuke Miyakawa
9c8bde576a Fragmentize WifiSettings.
- Add button bar feature toward SettingsPreferenceFragment,
  which has existed in PreferenceActivity and has been used
  (probably) only by Settings app.
- super.onActivityCreated() is not called at the beggining of
  WifiSettings#onActivityCreated(), the parent method assumes
  the child should have prepared PreferenceScreen, while
  WifiSettings cannot do until the parent Activity is ready.
- Call SetHasOptionMenu() should be called AFTER the parent
  Activity is ready. It is not documented, so it would be better
  to file another bug.
- Add exception to proguard...

Change-Id: Iebd27f0cb0abdbee9b4b1cc9b00f4bf127f7815d
2010-08-25 16:03:33 -07:00
Daisuke Miyakawa
3f1f0393f8 Tiny fix: remove warnings in WifiApiDialog.
Change-Id: Ifff3dd5d0a98e0be5bbe97c11fe4441bccfa6d09
2010-08-15 19:34:15 -07:00
Irfan Sheriff
d821c7adcc asynchronous API changes
Use the simplified connect, save & remove async API

Change-Id: I5754f1772163bcb4ab0ae18cab3747e17c21531a
2010-08-11 08:32:28 -07:00
Irfan Sheriff
7add00049a Increase scan time in settings
With the combo scan on all bands taking about 5-6s,
increase scan time in settings to 10s.

Change-Id: Ie98605a211dcb149b3bbd2c723bc10352e207cc3
2010-08-04 11:27:42 -07:00
Irfan Sheriff
97bdc93a3b am 40686ee8: am 15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f'

* commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f':
  Allow soft AP settings config before bring up
2010-06-25 19:53:30 -07:00
Irfan Sheriff
bb480bbb92 Allow soft AP settings config before bring up
Bug: 2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
2010-06-24 12:04:36 -07:00
Irfan Sheriff
3bf2d42490 am ca61c255: am a4966840: am de3e5665: Add phase2 authentication settings 2010-06-03 11:17:36 -07:00
Irfan Sheriff
a496684019 am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
Irfan Sheriff
dfa18503b6 am 9be3624f: am c1a587c9: am f3373c99: No quotes for password 2010-05-26 13:08:53 -07:00
Irfan Sheriff
c1a587c9e9 am f3373c99: No quotes for password
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp

* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
  No quotes for password
2010-05-26 13:04:05 -07:00
Irfan Sheriff
f3373c9949 No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.

Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
2010-05-26 12:53:24 -07:00
Irfan Sheriff
d723815fbc am d3c30527: am 75a43c60: am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo 2010-05-17 15:03:52 -07:00
Irfan Sheriff
75a43c6054 am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo
Merge commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448' into froyo-plus-aosp

* commit 'cd8f068ed2b5385ec420c1cabc8b1f62558a1448':
  Fix crash for tether with quotes in SSID
2010-05-17 13:29:00 -07:00
Irfan Sheriff
18dc7ea709 Fix crash for tether with quotes in SSID
Multiple quotes cause havoc with netd interaction right now.
The solution is to revert the changes for WifiConfiguration on
Access Point side done in Change I0f1e508b and remove all quotes
in the SSID.

Essentially a low risk one line change on top of the revert.

We dont expose API for WifiConfiguration on AP side. This solution
essentially means we treat SSID in WifiConfiguration on AP side
differently. When we do expose things, we should make things consistent.

Change-Id: I0a7e5074b83ace743fc843ee61c1ff86cde8267f
2010-05-17 13:20:39 -07:00
Chung-yih Wang
de5302577f am 5dcdbb5c: am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue. 2010-05-17 09:21:28 -07:00
Chung-yih Wang
8719f0d20a am 8c81257f: Fix the double-quoted SSID issue.
Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp

* commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
  Fix the double-quoted SSID issue.
2010-05-14 23:16:25 -07:00
Chung-yih Wang
8c81257f70 Fix the double-quoted SSID issue.
Bug id http://b/issue?id=2684571

Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
2010-05-15 10:57:23 +08:00
The Android Open Source Project
64a2d0c0fe am 1795d18f: am 2c3265af: merge from open-source master 2010-04-21 10:18:33 -07:00
The Android Open Source Project
2c3265af74 merge from open-source master
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
2010-04-21 09:46:57 -07:00
Mike Lockwood
68b8069862 Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-20 13:52:38 -04:00
Irfan Sheriff
c02e258eaa am e7879010: am ea87b6d7: Merge "Stop scanning after errors" into froyo 2010-04-17 09:44:54 -07:00
Irfan Sheriff
ea87b6d75c Merge "Stop scanning after errors" into froyo 2010-04-17 09:28:21 -07:00
Irfan Sheriff
e81497095b Stop scanning after errors
When scan fails for 3 times, we show a
failure toast and continue to scan.
In one case this caused infinite toasts,
until the user stopped wifi.

Its not clear what can cause this kind of
a state since wifi disable broadcast should
stop the scans. This fix will stop scans
after 3 continuous failures. Any wifi state
change will restart scan.

Bug: 2601937
Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
2010-04-16 14:56:54 -07:00
Irfan Sheriff
24e5193e3f am 39a7379a: am c190c4f5: Merge "Grey out wifi tethering in airplane mode" into froyo 2010-04-15 12:32:49 -07:00
Irfan Sheriff
2d4e135fec Grey out wifi tethering in airplane mode
When airplane mode is enabled, wifi tethering
should be disabled since there is no real
use case for it.

This also addresses the issue
of trying to restore Wifi (with tethering on)
when airplane mode is disabled.

Bug: 2594720
Change-Id: I7379ebed74a58b148ae82ed589d09aa2b9ca767d
2010-04-14 15:15:09 -07:00
Irfan Sheriff
5536c4a052 am a4bbf553: am 3957b3c1: Merge "scan only when wifi is enabled" into froyo 2010-04-10 11:58:12 -07:00
Irfan Sheriff
2215c7f868 scan only when wifi is enabled
Bug: 2570611
Change-Id: Ibb51dee8ec110179ec28f9469526a1fe61e74d00
2010-04-09 17:52:26 -07:00
Irfan Sheriff
7c85ce9242 am 0e10c088: am 0b266964: Fix window leak on orientation change 2010-04-07 15:09:43 -07:00
Irfan Sheriff
0b2669647f Fix window leak on orientation change
Use Activity managed dialogs

Bug: 2571764
Bug: 2571820
Change-Id: Id506988abd4200155774e92b31dd132519e29172
2010-04-07 14:38:42 -07:00
Irfan Sheriff
f5a6e5bfa9 am dbb0a7ed: am 6e74d41b: Fix network disable on connect 2010-04-05 10:19:31 -07:00
Irfan Sheriff
6e74d41bd0 Fix network disable on connect
If we dont have an updated access point list
when we are re-enabling networks after connecting,
we could end up keeping some networks disabled.

This could happen if there is no event that
triggers an access point before enabling networks

Update the current access point list
right before enabling all networks.

Bug: 2567770
Change-Id: Ieb1ac8147d4acb05a6d13c44396653f0af94643d
2010-04-05 09:28:25 -07:00
Freeman Ng
79470d1a66 wifi settings option to only enable Next button once a wifi connection is established
Change-Id: I4b346648bce4b93f4885f1577a1510dcd18d8df5
2010-03-31 11:11:28 -07:00
Irfan Sheriff
9303d97e6a Remember Wifi state prior to tethering
We now remember whether Wifi was enabled
prior to enabling tethering. This will
allow us to restore Wifi when tethering
is disabled.

Bug: 2537983
Change-Id: Ia530563bd5647856d62cd59b67ae5156de6fd5d9
2010-03-25 12:23:18 -07:00
Irfan Sheriff
a6a74e222a Disable tethering to enable Wifi
We need to explicitly disable wifi while enabling
tethering and disable tethering while enabling wifi

Bug: 2539071
Change-Id: I7fda6e4d9d1bb804e81561d52b5f3a982a674b0e
2010-03-25 11:39:11 -07:00
Chung-yih Wang
141fe818f1 Fix the incorrect keystore prefix of private key in the wpa_supplicant.conf.
Change-Id: Ibc77d10f6c945d274037422b2e4e58d1bbd9888d
2010-03-23 12:17:20 +08:00
Irfan Sheriff
9775dc9515 Add password hint and fix settings crash
Bug: 2534348
Bug: 2533980
Change-Id: I2f220ac9c710869d3f93a56557afb33478c3b323
2010-03-22 15:33:44 -07:00
Irfan Sheriff
3e5cfe8f0a Update AP config status
Bug: 2533950
Change-Id: Idac1213b9dc44c073fa5cf8da00b8599161565f2
2010-03-22 14:50:46 -07:00
Irfan Sheriff
b3be4d0c50 Move status update to WifiApEnabler
Bug: 2528202
Change-Id: I093699ac171279af9df5f3b3b4ae359aab79088b
2010-03-19 09:17:59 -07:00
Chia-chi Yeh
05d35416e8 WifiSettings: do not set auth_alg for WPA/WPA2 networks.
Change-Id: Ib41a52d90ca8db3cb52aa1fb87e2433bb76f4de2
2010-03-17 15:52:54 +08:00
Irfan Sheriff
47ebb78954 softAp UI changes
Remove channel settings
Add subtext error handling
Remove WEP, keep WPA2 only for now

Bug: 2413908
Change-Id: Ie867e84a0705f0d2185eeb3a4c86a8227446a338
2010-03-16 16:03:13 -07:00
Dmitry Shmidt
c11618c826 Fix WEP Open/Shared network settings
Change-Id: I2ccf73e19d27ed5c60f3f028a44a241ed6a7bb50
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-03-16 12:47:33 -07:00
Adam Powell
cc2ee7fcc6 Fixed NPE in WifiApDialog found by monkey
Change-Id: I4f5e75e21c1e3433712e49a148db4af04215f0a1
2010-03-08 11:35:15 -08:00
Adam Powell
2d70273673 Added null check for monkey behavior 2010-03-05 17:51:40 -08:00
Irfan Sheriff
2ae37e8ce0 Get all strings in for Wifi tethering
Bug: 2413908
Change-Id: I3d28fcfcb4a6e4eaf03e57d69f9d2c92730b12e5
2010-03-04 17:40:43 -08:00