summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
Commit message (Expand)AuthorAgeFilesLines
* log wifi actions from settingsChris Wren2015-03-302-1/+8
* log visibility of viewsChris Wren2015-03-274-0/+24
* Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'...Prerepa Viswanadham2015-03-253-9/+21
|\
| * Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-243-9/+21
| |\
| | * Restore password visibility on screen rotation in Hotspot/Wifi setup.Sanket Padawe2015-03-203-9/+21
* | | Added a screen to configure wireless scanningLifu Tang2015-03-231-10/+0
|/ /
* | Merge "Fix crash while trying to connect to network in WiFi Settings."Sanket Padawe2015-03-191-1/+1
|\ \
| * | Fix crash while trying to connect to network in WiFi Settings.Sanket Padawe2015-03-181-1/+1
* | | Settings: Remove all unused imports.John Spurlock2015-03-183-4/+0
|/ /
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-161-1/+44
|\ \ | |/
| * am "Do not provide 5GHz option for softap if there is no country code available"Vinit Deshpande2015-03-061-0/+15
| |\
| | * Do not provide 5GHz option for softap if there is no country code availablexinhe2015-02-241-0/+15
| * | am "set softAP on a specified band, including both 2.4 and 5 GHz band"Vinit Deshpande2015-03-061-1/+29
| |\ \ | | |/
| | * set softAP on a specified band, including both 2.4 and 5 GHz bandxinhe2015-01-161-1/+29
* | | [WifiSettings] Refactor Wi-Fi required infoMaurice Lam2015-03-111-1/+3
* | | Badge Wi-Fi installer appsRobin Lee2015-02-271-7/+20
* | | Merge "Move some Tethering code to SettingsLib to share"Jason Monk2015-02-241-51/+11
|\ \ \
| * | | Move some Tethering code to SettingsLib to shareJason Monk2015-02-121-51/+11
* | | | Remove obsolete WifiSettingsForSetupWizardXLAdrian Roos2015-02-114-1006/+2
|/ / /
* | | Move some wifi tracking code to SettingsLibJason Monk2015-02-0413-1202/+297
* | | am 2e75203a: Use getDefaultAdapter instead of getNfcAdapter automerge: 98d8a49Andres Morales2015-02-031-2/+1
|\ \ \
| * \ \ am 2e75203a: Use getDefaultAdapter instead of getNfcAdapterAndres Morales2015-02-031-2/+1
| |\ \ \ | | |/ /
| | * | Use getDefaultAdapter instead of getNfcAdapterAndres Morales2015-02-021-2/+1
* | | | [WifiSetup] Don't show menu during setupMaurice Lam2015-01-211-19/+6
* | | | Remove grey Wi-Fi icon from Setup WizardMaurice Lam2015-01-152-20/+9
* | | | am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other conn...Lucky Zhang2015-01-141-21/+44
|\ \ \ \ | |/ / /
| * | | am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other conn...Lucky Zhang2015-01-141-21/+44
| |\ \ \ | | |/ /
| | * | [Settings] Wifi Setup responds to other connection state changeLucky Zhang2015-01-131-21/+44
* | | | am dfb448d2: am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option...Andres Morales2015-01-071-1/+4
|\ \ \ \ | |/ / /
| * | | am f58a646b: am f11feccf: Merge "Don\'t display Write NFC option if no NFC" i...Andres Morales2015-01-071-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Don't display Write NFC option if no NFC" into lmp-mr1-devAndres Morales2015-01-071-1/+4
| | |\ \ | | | |/ | | |/|
| | | * Don't display Write NFC option if no NFCAndres Morales2015-01-061-1/+4
* | | | am c0ecaeef: am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tet...Jason Monk2014-12-161-6/+11
|\ \ \ \ | |/ / /
| * | | am 5aaa4b63: am b0c8c393: Merge "Add a periodic check of the tethering provis...Jason Monk2014-12-161-6/+11
| |\ \ \ | | |/ /
| | * | Merge "Add a periodic check of the tethering provisioning" into lmp-mr1-devJason Monk2014-12-161-6/+11
| | |\ \
| | | * | Add a periodic check of the tethering provisioningJason Monk2014-12-111-6/+11
| * | | | resolved conflicts for merge of fa893886 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-151-12/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Stop using apache-http in settings.Narayan Kamath2014-12-121-10/+11
* | | | | Stop using apache-http in settings.Narayan Kamath2014-12-151-12/+11
* | | | | am b366a286: am 5a528b27: Merge "Listen for CONNECTIVITY_ACTION broadcasts in...Emily Bernier2014-12-101-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Listen for CONNECTIVITY_ACTION broadcasts in WifiSetupActivityEmily Bernier2014-12-091-1/+5
| | |/ / | |/| |
* | | | resolve merge conflicts of 0c7e4ed to master.Jeff Davidson2014-12-096-31/+50
|\ \ \ \ | |/ / /
| * | | Final platform settings UX for ephemeral networks.Jeff Davidson2014-12-056-33/+51
| | |/ | |/|
* | | am c33b2ee3: am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" int...PauloftheWest2014-12-021-1/+2
|\ \ \ | |/ /
| * | Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-devPauloftheWest2014-12-021-1/+2
| |\ \
| | * | Fixed a Wi-Fi dialog crashPauloftheWest2014-11-251-1/+2
* | | | am 62009bf8: am a2caf633: am 1dce16a6: Merge "[WifiSetup] Swap buttons positi...Maurice Lam2014-12-021-2/+2
|\ \ \ \ | |/ / /
| * | | [WifiSetup] Swap buttons position in Skip dialogMaurice Lam2014-12-011-2/+2
* | | | am edfc6a0a: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric...Maurice Lam2014-11-261-54/+6
|\ \ \ \ | |/ / /
| * | | [Setup] Theme ChooseLockGeneric for setup wizardMaurice Lam2014-11-251-54/+6
| |/ /