Commit Graph

3060 Commits

Author SHA1 Message Date
Maurice Lam
7ba56cfd2d Merge "[WifiSetup] Make dialogs immersive" 2015-04-16 16:33:07 +00:00
Lorenzo Colitti
877b054bfe Dialog box for networks without an Internet connection
Bug: 20081183
Change-Id: If4866a341382fa37745ae5aa2d10372f052d5dd6
2015-04-15 15:24:20 +09:00
Sanket Padawe
dce1c724f1 Remove "Show apps" and add summary to saved networks from Wifi Settings.
Bug: 20148271
Change-Id: Ie042ac83a7253ff86f3eda77fb1e8a4c0e1a13d5
2015-04-13 17:57:38 -07:00
Prerepa Viswanadham
1d7dc74b45 Merge commit '0507524' into merge_work 2015-04-10 15:43:14 -07:00
Maurice Lam
3f7c09bd5a [WifiSetup] Make dialogs immersive
Added a dialog specific applyImmersiveFlags method that adds
immersive flags without the LAYOUT_ flags. The LAYOUT_ flags causes
the dialog to not resize when IME is visible, and the dialog doesn't
need to be drawn under the navigation / status bars anyway.

Bug: 17759269
Change-Id: I0186e85d9f398af73c511b1a5ec6e83febe97f83
2015-04-09 16:27:13 -07:00
Maurice Lam
342d08537f Merge "Add support for material_blue theme" 2015-04-09 20:13:36 +00:00
Maurice Lam
598be1eab6 Add support for material_blue theme
Add support for material_blue theme, which setup wizard is going to
use for M. This changes SetupWizardUtils.getTheme to always return
either SetupWizardTheme or SetupWizardTheme_Light, and added the
theme value "material" blue.

Bug: 19729981
Change-Id: I63678312af4942be358b92a58b1c84f89aaaa6c1
2015-04-08 21:13:42 -07:00
Lifu Tang
be794c30ca Added links to scanning settings
Bug: 19918721
Change-Id: Ifb1508807d34b675e9ea1522f86a9310ed6b663f
2015-04-06 11:00:04 -07:00
Vinit Deshpande
295793928d Implement 'Available via Passpoint' feature
This also fixes the issues related to explicit connection
to passpoint AP, and fixes occassional mention of
'connected via Wi-Fi Assistent'

Change-Id: Ib4de956f2ea29709d0212fbcb392815644800e78
2015-04-03 16:42:28 -07:00
Alex Klyubin
b009023c76 Make Settings app not use cleartext network traffic.
This CL switches the only two places which use cleartext HTTP in this
app to HTTPS. It also declares in the AndroidManifest.xml that this
app does not use cleartext network traffic, thus asking the platform
and tools to block any such traffic from this app on best effort
basis.

NOTE: The only test that uses cleartext HTTP traffic is in VpnTests.
This test makes cleartext HTTP requests to a third-party service which
does not appear to support HTTPS. Thus, this CL temporarily relaxes
the cleartext traffic policy during this test to keep it working. The
correct longer-term fix for this test is to use a service that offers
HTTPS.

Bug: 19215516
Change-Id: Idf1ff8c66d43d77ef2114b2f1b676927844150e5
2015-04-02 11:30:15 -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
Chris Wren
f22e8c4c2e log wifi actions from settings
To start:
  enable
  disable
  forget
  connect
  add

Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
2015-03-30 14:33:27 -04:00
Chris Wren
8a963babe2 log visibility of views
Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
2015-03-27 13:39:07 -04:00
Vinit Deshpande
15b4c84c31 Fix settings UI for passpoint networks
This change includes showing the friendly name in saved
networks list and 'Connected via provider' addition for
passpoint connections.

Change-Id: I613770e0468f888c280e82a89b8a012a841d5bbd
2015-03-25 15:41:03 -07:00
Prerepa Viswanadham
9d2ebc3cf0 Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge Fix build in DevelopmentSettings.java" 2015-03-25 19:59:48 +00: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
Lifu Tang
cb193d55e1 Added a screen to configure wireless scanning
- Created "Scanning" preference screen

- Added overflow menu on "Location" settings to access "Scanning" settings

- Moved "Wi-Fi scanning always available" from Wi-Fi settings to "Scanning"
  settings

- Added "Bluetooth scanning always available" preference (UI only)

Change-Id: I85d8cd60ab309db5db9caee43f4b5a117192d904
2015-03-23 15:55:10 -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
Sanket Padawe
fc0d674e7a Merge "Fix crash while trying to connect to network in WiFi Settings." 2015-03-19 17:26:40 +00:00
Sanket Padawe
b5f4a2c86e Fix crash while trying to connect to network in WiFi Settings.
Bug: 19535465
Change-Id: Ibfc40a08e6c648681df5fd16e2334d9ec45b10f4
2015-03-18 16:20:40 -07:00
John Spurlock
9a23adf69d Settings: Remove all unused imports.
Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
2015-03-18 15:51:15 -04:00
Vinit Deshpande
3b84208212 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
2015-03-16 00:55:25 -07:00
Maurice Lam
b484340e3d [WifiSettings] Refactor Wi-Fi required info
Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.

The required info is not shown since Lollipop, but can be tested with
    adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
            --es theme material_light \
            --ez useImmersiveMode true \
            --ez wifi_show_wifi_required_info true

Bug: 19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c
2015-03-11 23:03:07 +00:00
Vinit Deshpande
128e25cec0 am "Do not provide 5GHz option for softap if there is no country code available"
merged from partner/m-wireless-wifi-dev
d51b952 Do not provide 5GHz option for softap if there is no country code available
2015-03-06 13:56:02 -08:00
Vinit Deshpande
2797429bd8 am "set softAP on a specified band, including both 2.4 and 5 GHz band"
merged from partner/m-wireless-wifi-dev
82ff3d5 set softAP on a specified band, including both 2.4 and 5 GHz band
2015-03-06 13:56:02 -08:00
Robin Lee
0d8879ade7 Badge Wi-Fi installer apps
Consistent, and more importantly useful to know which version of an app
was responsible for installing a network.

Change-Id: I37e326f419e03b020e17daa7d65c713d1ea6ddc8
2015-02-27 15:57:53 +00:00
xinhe
d51b9525c9 Do not provide 5GHz option for softap if there is no country code available
Bug:19414134
Change-Id: I3899d9daa33eca5d2c5528c2e4da97b02d019160
2015-02-24 10:09:56 -08:00
Jason Monk
e77b04a64f Merge "Move some Tethering code to SettingsLib to share" 2015-02-24 13:16:43 +00:00
Jason Monk
4896c01729 Move some Tethering code to SettingsLib to share
Change-Id: I43a356f2a14af4a15d1827919c39bbd1a04d3a94
2015-02-12 10:33:40 -05: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
Andres Morales
c91676e6d9 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge: 98d8a49
automerge: 4bd31b9

* commit '4bd31b9ac676a5d3c6943bc9f86f524eedad5bef':
  Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:04:37 +00:00
Andres Morales
4bd31b9ac6 am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter
automerge: 98d8a49

* commit '98d8a490d5930c9f6179c8aefe792012c542ddbb':
  Use getDefaultAdapter instead of getNfcAdapter
2015-02-03 16:01:45 +00:00
Andres Morales
2e75203a6e Use getDefaultAdapter instead of getNfcAdapter
getNfcAdapter can throw an exception if NFC is not
available

Bug: 19227597
Change-Id: Ib95849057938066dc5760a34f16333f5423ce61f
2015-02-02 13:39:57 -08:00
Maurice Lam
d9165c06a4 [WifiSetup] Don't show menu during setup
Hides the menu during Wi-Fi setup -- we removed the menu button from
the UI but the menu can still be started with a hardware menu button.
This change removes that ability as well (during setup).

If you want to test on a device without a hardware menu button, you
can use the command
    adb shell input keyevent 82

Change-Id: Ibe3cc679353a83c995e24680c3e7dc1575d32fe0
2015-01-21 09:48:42 -08:00
xinhe
82ff3d5c56 set softAP on a specified band, including both 2.4 and 5 GHz band
Bug:18929692
Change-Id: I455e9b17e5091596beb0246ccfd981c5d2b932f0
2015-01-16 10:50:56 -08:00
Maurice Lam
859dcab128 Remove grey Wi-Fi icon from Setup Wizard
This removes the grey Wi-Fi icon from the empty-view in the Wi-Fi
list of Setup Wizard. Also updated the style so it looks like the
description text in other setup screens.
Also fixed the view recycling by not calling getRootAdapter in
onActivityCreated, since that will cause the Preference framework
to not cache the AccessPoint preference.

Bug: 17575719
Bug: 16518752
Change-Id: I06cbc88db1c04b29a9ce8221596265effc39b90b
2015-01-15 14:33:31 -08:00
Lucky Zhang
53cc0556d8 am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
automerge: 591a091

* commit '591a09131162a32ad5923dc3553a464a5da1d39c':
  [Settings] Wifi Setup responds to other connection state change
2015-01-14 22:32:31 +00:00
Lucky Zhang
591a091311 am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
* commit '585b53e6d2ddc0725ce69f6f7208ad791e8d256e':
  [Settings] Wifi Setup responds to other connection state change
2015-01-14 12:06:43 +00:00
Lucky Zhang
9fe89bbb2e [Settings] Wifi Setup responds to other connection state change
Made use of the two new extras isNetworkRequired and ifWifiRequired in
deciding the ui state of the wifi setting. The CL that adds these
extras in setup wizard is here (http://ag/612291).

Added logic to update the next ("skip") button state accordingly:

(1) "Skip" button should be enabled if
    - wifi is not required and network is not required
    - or wifi is not required, but network is required, and we have a
      valid network connection

(2) "Skip" button should be disabled if
    - wifi is required
    - or wifi is not required, but network is required, and we have
      no valid network connection

Note that the newly added logic is only run if wifi is not connected. If
wifi is already connected, the next button will show "next" and be
enabled.

This fixes the bug where wifi settings in setup wizard does not respond
to mobile data connection change.

Bug: 18783746
Change-Id: I155dcb158f790dd96a71099339f64b64cc647da0
2015-01-13 17:20:42 -08:00
Andres Morales
c2fb78627f am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit 'dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
  Don't display Write NFC option if no NFC
2015-01-07 16:37:55 +00:00
Andres Morales
dfb448d23e am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit 'f58a646bc01cc8d416d5babae2d06dad5018cc6d':
  Don't display Write NFC option if no NFC
2015-01-07 16:31:57 +00:00
Andres Morales
f11feccf99 Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev 2015-01-07 16:21:48 +00:00
Andres Morales
64c7429ac8 Don't display Write NFC option if no NFC
Bug: 18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
2015-01-06 09:38:53 -08:00
Jason Monk
2e904fdd28 am c0ecaeef: am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit 'c0ecaeefe8d22c8dbd77c51090cb55e1c448b983':
  Add a periodic check of the tethering provisioning
2014-12-16 17:11:29 +00:00
Jason Monk
c0ecaeefe8 am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev
* commit '5aaa4b63bd6ee0639ee067e3287e5d97b692a444':
  Add a periodic check of the tethering provisioning
2014-12-16 17:05:14 +00:00
Jason Monk
b0c8c3935d Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-dev 2014-12-16 15:44:27 +00:00
Narayan Kamath
62d35b65f2 resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aosp
Change-Id: Iaf57dd96ab10c3f03a964fed593571895ea7be3a
2014-12-15 16:27:39 +00:00
Narayan Kamath
7a250b8288 Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

(cherry picked from commit f25627c0c9)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0
2014-12-15 14:32:38 +00:00
Narayan Kamath
f25627c0c9 Stop using apache-http in settings.
Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
2014-12-12 14:22:06 +00:00