summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2017-04-281-3/+2
* Automatic translation importAbhisek Devkota2017-02-191-0/+3
* Automatic translation importblinky@build012016-12-2214-0/+42
* Automatic translation importblinky@build012016-08-131-0/+8
* Automatic translation importAbhisek Devkota2016-05-171-0/+1
* Automatic translation importAbhisek Devkota2016-05-141-0/+4
* Partially revert "Merge tag 'android-6.0.1_r22' of https://android.googlesour...Michael Bestas2016-05-0478-0/+250
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-1178-250/+0
|\
| * am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gst...Erik Kline2015-07-271-1/+1
| |\
| * \ am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal c...Paul Jensen2015-07-101-5/+6
| |\ \
| * \ \ am 7b8ce2fa: Merge "Log SslErrors from captive portal sign in app." into mnc-devPaul Jensen2015-06-091-1/+4
| |\ \ \
| * \ \ \ am 16bef48d: Merge "Add support for tel: links in captive portal app." into m...Paul Jensen2015-06-091-0/+9
| |\ \ \ \
| * \ \ \ \ am 736432ed: Merge "Disallow going back to initial empty page in captive port...Paul Jensen2015-06-031-12/+25
| |\ \ \ \ \
| * \ \ \ \ \ am e247cdec: Merge "Update captive portal sign-in app SSL error page UI." int...Paul Jensen2015-06-034-10/+70
| |\ \ \ \ \ \
* | | | | | | | Make CaptivePortalLoginActivity compatible with setupwizard.Ramswaroop Ghanshyam Somani2016-02-291-1/+5
* | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+27
* | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | CaptivePortalLogin: Allow overriding of progress colorcretin452015-10-261-0/+10
* | | | | | | | CaptivePortalLogin: Add functionality for SetupWizardcretin452015-10-262-0/+31
|/ / / / / / /
* | | | | | | Change to connectivitycheck.gstatic.comErik Kline2015-07-201-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Add android.net.CaptivePortal class for captive-portal-handling-app callbacksPaul Jensen2015-07-091-5/+6
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-105-6/+6
| |_|_|_|/ |/| | | |
* | | | | Log SslErrors from captive portal sign in app.Paul Jensen2015-06-091-1/+4
| |_|_|/ |/| | |
* | | | Add support for tel: links in captive portal app.Paul Jensen2015-06-091-0/+9
* | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-462/+231
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0377-0/+462
|\ \ \ \ | |_|_|/ |/| | |
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-06-0377-0/+462
| | |/ | |/|
* | | Disallow going back to initial empty page in captive portal appPaul Jensen2015-06-031-12/+25
|/ /
* | Merge "Update captive portal sign-in app SSL error page UI." into mnc-devPaul Jensen2015-06-034-10/+70
|\ \
| * | Update captive portal sign-in app SSL error page UI.Paul Jensen2015-06-034-10/+70
| |/
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+8
|/
* Don't leak NetworkListens in captive portal app.Paul Jensen2015-05-181-0/+11
* Add URL bar to captive portal login app.Paul Jensen2015-05-062-5/+17
* Merge commit '25a217c' into merge2Etan Cohen2015-04-242-40/+31
|\
| * Add captive portal API.Paul Jensen2015-04-162-40/+31
* | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+24
* | Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-1/+1
|\ \ | |/
| * Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-021-1/+1
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-2044-86/+51
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1829-58/+29
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1672-72/+144
* | am "Correct "Sign-in" and "Sign into" to "Sign in to"."Vinit Deshpande2015-03-153-3/+3
|\ \ | |/
| * Correct "Sign-in" and "Sign into" to "Sign in to".Paul Jensen2015-03-033-3/+3
* | Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
* | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-1/+1
* | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-1/+1
|\ \
| * \ am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own hos...Lorenzo Colitti2015-01-141-1/+1
| |\ \ | | |/
| | * Switch the connectivity check to its own hostname.Lorenzo Colitti2015-01-141-1/+1
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1