summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * Use network-specific HTTP proxy settings in captive portal login app.Paul Jensen2014-10-031-6/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTTP proxy system properties are set based on the proxy configured for the network the captive portal login app is operating on. These system properties are subsequently read by the WebView used to perform the sign-in. This is a short-term fix using reflection. This allows users with cellular providers that use proxies to sign into WiFi captive portals. The long-term fix could involve: 1. Sending out a network-specific proxy config changed broadcast, and 2. Modifying the ActivityThread to set proxy system properties for Networks selected with setProcessDefaultNetwork(), and 3. Modifying WebView to read from the proxy system properties when PROXY_CHANGE_ACTION broadcasts are received. bug:17679789 Change-Id: I3ada0470ad085df1a4452b4a655ac35f310d2241
* | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibd8d225f7dba901fb1f0a00afb4fd315fd569b66 Auto-generated-cl: translation import
* | | am 60c8c86d: am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make ↵Paul Jensen2014-10-012-1/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | CaptivePortalLogin app exit if underlying Network disconnects. * commit '60c8c86df39ccb8f281203823e3c775d1b3d2e6f': Make CaptivePortalLogin app exit if underlying Network disconnects.
| * | am 8c4ba7c3: am 18434fcc: am a524b0f7: am 8df099df: Make CaptivePortalLogin ↵Paul Jensen2014-10-012-1/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | app exit if underlying Network disconnects. * commit '8c4ba7c3f6263a692c9b2ac1164348ad853206e8': Make CaptivePortalLogin app exit if underlying Network disconnects.
| | * Make CaptivePortalLogin app exit if underlying Network disconnects.Paul Jensen2014-09-302-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | The app is no longer useful if the underlying Network has disconnected and could get in the way of another signing into another Network. bug:17672087 Change-Id: I26e820444640975e7fd4dd73244f4d4f4b40cb5e
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-262-2/+2
| | | | | | | | | | | | | | | Change-Id: I5f6a84a6344633a8fabb8e66b4f5d337fad054e1 Auto-generated-cl: translation import
* | | am c0073bfa: am 77cc46f2: am 20862a7f: Merge "Update material colors" into ↵Alan Viverette2014-08-261-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit 'c0073bfa6b3043ca7ddc1f410f8085887267ef91': Update material colors
| * | am 20862a7f: Merge "Update material colors" into lmp-devAlan Viverette2014-08-251-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '20862a7fe43f05b12a6f95515ab08ae0bffb1bae': Update material colors
| | * Update material colorsAlan Viverette2014-08-251-1/+1
| | | | | | | | | | | | | | | BUG: 17212898 Change-Id: Ic0806db57e88d5143b4241e419970ffeb2468d50
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-242-2/+2
| | | | | | | | | | | | | | | Change-Id: I0d2a27a5cfa2fab7ee6d35c01de947a252f68672 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I36f77170a05a094d2453821d8f58e36c11fc4b86 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-08-111-1/+1
| | | | | | | | | | | | | | | Change-Id: I6cce63045f48ea92f8c654b231ca98d86dd60170 Auto-generated-cl: translation import
* | | am fc8f5a22: am a3f77fe8: am c9926974: Switch CaptivePortalLogin app to use ↵Paul Jensen2014-08-074-7/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | theme like Settings UI. * commit 'fc8f5a223c5fa415709e608aa11df91d498a0c95': Switch CaptivePortalLogin app to use theme like Settings UI.
| * | am c9926974: Switch CaptivePortalLogin app to use theme like Settings UI.Paul Jensen2014-08-074-7/+19
| |\ \ | | |/ | | | | | | | | | * commit 'c99269745257bc6b6a20420280e6b12085365803': Switch CaptivePortalLogin app to use theme like Settings UI.
| | * Switch CaptivePortalLogin app to use theme like Settings UI.Paul Jensen2014-08-074-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The theme is switched to Theme.Material.Settings. The progress bar window feature is not supported in Material (b/16652978) so I added a progress bar to the layout. The Theme.Material.Setting's accent color is set such that ProgressBars are indistinguishable, so accent color is reset back to the parent's setting. bug:15409354 Change-Id: Ic2862b8439be8591ec426f3d4dffad72179b2539
| | * Import translations. DO NOT MERGEGeoff Mendal2014-08-0469-0/+552
| | | | | | | | | | | | | | | Change-Id: I11a53b337e1607794c52fd0e60fd6fefac76f9ef Auto-generated-cl: translation import
| | * Import translations. DO NOT MERGEGeoff Mendal2014-07-303-0/+24
| |/ | | | | | | | | Change-Id: I548370fd62b7a26852d16ddbd22ef67ea6369080 Auto-generated-cl: translation import