summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+11
| | | | | Change-Id: I28973f9307de9323e13d9ef26b0fd652a8ffb578 Auto-generated-cl: translation import
* Change to connectivitycheck.gstatic.comErik Kline2015-07-201-1/+1
| | | | | | Bug: 18869302 Bug: 22368233 Change-Id: Iaecb59e4ef13a0fa82a0a4a920689804d24044c8
* Add android.net.CaptivePortal class for captive-portal-handling-app callbacksPaul Jensen2015-07-091-5/+6
| | | | | | | | This new class replaces the awkward string token and ConnectivityManager APIs used by apps handling captive portals. Bug:21343774 Change-Id: I1a2c69edb17322715bf8422bb4216b0ea60bfd59
* Import translations. DO NOT MERGEGeoff Mendal2015-06-105-6/+6
| | | | | Change-Id: Id91c1fc06d73c8f99d53a5fce6d08ef9922b5d07 Auto-generated-cl: translation import
* Log SslErrors from captive portal sign in app.Paul Jensen2015-06-091-1/+4
| | | | | Bug:21604873 Change-Id: I0361da37039bb4f0f9d2e0dabbae4ab2ddbb05e3
* Add support for tel: links in captive portal app.Paul Jensen2015-06-091-0/+9
| | | | | Bug:21447011 Change-Id: I72ec4fd780ddb89cecfa584aa285f3822f326810
* Import translations. DO NOT MERGEGeoff Mendal2015-06-0877-462/+231
| | | | | Change-Id: I2793d7c9398a326a5ed7eccc9e0d241876cf2947 Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-0377-0/+462
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-06-0377-0/+462
| | | | | | | | | | Change-Id: I8cb4cb369c064d934e671d9ae8086f9d079d79f3 Auto-generated-cl: translation import
* | Disallow going back to initial empty page in captive portal appPaul Jensen2015-06-031-12/+25
|/ | | | | | | | | This is a little tricky because WebView history can only be cleared after the next page load and we don't want to allow hitting back during the first page load. Bug:21147832 Change-Id: I639dfd27d4dc3af618282256ca02b9947e64a7b9
* 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
| | | | | | | | | | | | | | | | | | | | Add text and update image as per UX team recommendations. Add "Use as is and open browser" link. Bug:18791346 Bug:20038019 Bug:20486308 Change-Id: Ibf6d1493f5332e7905154cc7306645ac4c1a6283
* | Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+8
|/ | | | | Change-Id: Iaf2d35fbd552a97e238b3b4ba0b531a86d842e9f Auto-generated-cl: translation import
* Don't leak NetworkListens in captive portal app.Paul Jensen2015-05-181-0/+11
| | | | | Bug:21146632 Change-Id: I934044a2eec89a47185add881a74de5669cd0f89
* Add URL bar to captive portal login app.Paul Jensen2015-05-062-5/+17
| | | | | | | | | Keeps the user informed whether site is using SSL and what URL is being displayed in an attempt to avoid phishing. The progress bar is now always visible as it provides a border between the URL bar and WebView. Bug:20322548 Change-Id: I001a4501a02cc79080b0f37f0a304c609bbd7664
* Merge commit '25a217c' into merge2Etan Cohen2015-04-242-40/+31
|\ | | | | | | Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f
| * Add captive portal API.Paul Jensen2015-04-162-40/+31
| | | | | | | | | | | | | | | | This API allows apps other than the system's CaptivePortalLogin to handle signing in to captive portals. bug:19416463 Change-Id: I27fce5856b635233e6ff66396d50ccabedd76cf5
* | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+24
| | | | | | | | | | Change-Id: I12b2928b11ea4ed7111e7c36753192ac07fee8d4 Auto-generated-cl: translation import
* | Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-1/+1
|\ \ | |/ | | | | Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
| * Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | These functions risk hitting an unchecked Exception due to ConnectivityManager not being instantiated yet. Also, change Network.openConnection() to throw a checked Exception rather than an unchecked Exception when ConnectivityManager is not yet instantiated. bug:19416463 Change-Id: Ie1e2b3238aec0343d267c76b64927073f2f05f85
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-2044-86/+51
| | | | | | | | | | Change-Id: I6fd85e17705e81326d3440fc3ef2180683c968b3 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1829-58/+29
| | | | | | | | | | Change-Id: I85066a98008872466f6cb03770ceb2ff94abed0e Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-03-1672-72/+144
| | | | | | | | | | Change-Id: I5059160456eb65bedb552f97b6ed500ef540839f Auto-generated-cl: translation import
* | am "Correct "Sign-in" and "Sign into" to "Sign in to"."Vinit Deshpande2015-03-153-3/+3
|\ \ | |/ | | | | | | merged from goog/mirror-m-wireless-internal-release 44f7239 Correct "Sign-in" and "Sign into" to "Sign in to".
| * Correct "Sign-in" and "Sign into" to "Sign in to".Paul Jensen2015-03-033-3/+3
| | | | | | | | | | bug:19416574 Change-Id: I55cedd2a3e1c1c3192ece860f37c82a55cb6d7c0
* | Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
| | | | | | | | Change-Id: I031443de83f93eb57a98863001826671b18f3b17
* | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-1/+1
| | | | | | | | | | Change-Id: I6272a8580b7a346ace41eadaabfda9de0fe81cb3 Auto-generated-cl: translation import
* | resolve merge conflicts of 87f5369 to master.Jorim Jaggi2015-01-151-1/+1
|\ \ | | | | | | | | | Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
| * \ am 792fd3d1: am 2b52cad1: Merge "Switch the connectivity check to its own ↵Lorenzo Colitti2015-01-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | hostname." into lmp-mr1-dev * commit '792fd3d1eea0d4e1c69480684cf3be4e4c215ace': Switch the connectivity check to its own hostname.
| | * Switch the connectivity check to its own hostname.Lorenzo Colitti2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 18467482 Bug: 18869302 Bug: 18924197 Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I2d6f0dda941a9f61b21d14c8d9d67be5a58de9ce Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-231-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib6e2182c8ba3a405612b9345614ad535adbac7fd Auto-generated-cl: translation import
* | | am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are ↵Paul Jensen2014-12-172-0/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae * commit 'c266f62fd9f241b0d122bae7ad016ecd58ab40da': Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
| * | am eece3339: Merge "Show broken lock image when SSL errors are encountered ↵Paul Jensen2014-12-172-0/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae * commit 'eece33395561fff249afc96749cd69a21c28fbac': Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
| | * Merge "Show broken lock image when SSL errors are encountered in ↵Paul Jensen2014-12-172-0/+15
| | |\ | | | | | | | | | | | | CaptivePortalLogin." into lmp-mr1-dev
| | | * Show broken lock image when SSL errors are encountered in CaptivePortalLogin.Paul Jensen2014-12-102-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WebView cancels the page load by default, so showing an indicative image at least informs users that there is a security problem. bug:18505835 bug:18570703 Change-Id: Ie6dd9294eec9ca25d27e95a1cd2c95e3065de469
* | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." ↵Paul Jensen2014-12-111-24/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: d9d48cc automerge: 8f58207 * commit '8f58207319fc2b73f83874892a544f8cf59cf7e9': Fix several HTTP proxy issues with multinetworking.
| * | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." ↵Paul Jensen2014-12-111-24/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: d9d48cc * commit 'd9d48cc9c7ab0d1590918e199917968eafc48288': Fix several HTTP proxy issues with multinetworking.
| | * | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-101-24/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Send PROXY_CHANGE_ACTION broadcast when any network's proxy changes, not just the default network. 2. When a process is bound to a particular Network, update the proxy system properties to those for the bound Network, and keep them updated when PROXY_CHANGE_ACTION broadcasts are received. 3. Make Network.openConnection() use the proxy for the Network. bug:17905627 bug:17420465 bug:18144582 (cherry-pick of https://android-review.googlesource.com/#/c/115170) Change-Id: Ia2819985e6108a8c121e74c683a5646becfd0a97
* | | am f19f90b2: am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor ↵Paul Jensen2014-11-261-12/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | state stop user-initiated transitions." into lmp-mr1-dev * commit 'f19f90b229c9d15b33895988fd5e4e13d786f616': Don't let NetworkMonitor state stop user-initiated transitions.
| * | am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop ↵Paul Jensen2014-11-261-12/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | user-initiated transitions." into lmp-mr1-dev * commit '58a493accfeafa13fd77a16e832c5ad72a4c9006': Don't let NetworkMonitor state stop user-initiated transitions.
| | * Don't let NetworkMonitor state stop user-initiated transitions.Paul Jensen2014-11-241-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCM can call reportInetCondition() at any time which can cause the NetworkMonitor to transition states to reevaluate at any time. Previously we were only listening for users clicking the sign-in notificaiton or completing sign-in when in the appropriate state. With this change NetworkMonitor's state does not stop us from listening for the user's actions. bug:17917929 Change-Id: Ic1da31d90f7090e5fc111874cb7c37d505aaf590
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I46f785bafa15445927a46f2a3fa31b659cae5492 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I071fdddc4673845a8168c3503c3a0c62217dfe67 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I1295cefe0532ffce1200d977c98acb53b8d3599d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-11-071-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic184c5ac9f0ef908ed5fec4afefb7cec8ce8e8ad Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I4729d8755ed7a04c80cd84a8bd706a808f9348ac Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
| | | | | | | | | | | | | | | Change-Id: Icf76ce41b336454e2b87b3cdb87b31ed22d903be Auto-generated-cl: translation import
* | | am 7f114608: am 35c19fb0: am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use ↵Paul Jensen2014-10-071-6/+76
|\ \ \ | |/ / | | | | | | | | | | | | | | | network-specific HTTP proxy settings in captive portal login app." into lmp-dev * commit '7f1146084b6caa3fa73a08968214868682e7833c': Use network-specific HTTP proxy settings in captive portal login app.
| * | am 35c19fb0: am 84527eca: am 69c489ed: am 7627d2cd: Merge "Use ↵Paul Jensen2014-10-071-6/+76
| |\ \ | | |/ | | | | | | | | | | | | | | | network-specific HTTP proxy settings in captive portal login app." into lmp-dev * commit '35c19fb0f4dd67b907c74294d7880d3547a209af': Use network-specific HTTP proxy settings in captive portal login app.