summaryrefslogtreecommitdiffstats
path: root/packages/CaptivePortalLogin
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importblinky@build012016-08-131-0/+8
| | | | | Change-Id: I599894bfd30ff9d78253482981737fc8a440a826 Ticket: -
* Automatic translation importAbhisek Devkota2016-05-171-0/+1
| | | | Change-Id: I3e905d33baa25bbbccffeb48dab1a53a22f6bc3a
* Automatic translation importAbhisek Devkota2016-05-141-0/+4
| | | | Change-Id: I3d1a3f5e5b488776048d0dbaac757ffb1e2f8e7b
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0478-0/+250
| | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1178-250/+0
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into cm-13.0 Android 6.0.1 release 22 Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
| * am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to ↵Erik Kline2015-07-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | connectivitycheck.gstatic.com" into mnc-dev * commit 'f0927733a31a95d88c32d2e41f40f1873361856b': Change to connectivitycheck.gstatic.com
| * \ am 2cb16d2e: am 75a43340: am 00c64f7c: Merge "Add android.net.CaptivePortal ↵Paul Jensen2015-07-101-5/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | class for captive-portal-handling-app callbacks" into mnc-dev * commit '2cb16d2e71398fcb73e3c7ecba093a4bae4490cb': Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
| * \ \ am 7b8ce2fa: Merge "Log SslErrors from captive portal sign in app." into mnc-devPaul Jensen2015-06-091-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '7b8ce2fa0e237c2a740f4648c5046d12b4c84f9b': Log SslErrors from captive portal sign in app.
| * \ \ \ am 16bef48d: Merge "Add support for tel: links in captive portal app." into ↵Paul Jensen2015-06-091-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '16bef48d2226c72167e3314f2bc48b0f5de61d81': Add support for tel: links in captive portal app.
| * \ \ \ \ am 736432ed: Merge "Disallow going back to initial empty page in captive ↵Paul Jensen2015-06-031-12/+25
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | portal app" into mnc-dev * commit '736432edd2bbfd1873b26e987c9ca36470d831d4': Disallow going back to initial empty page in captive portal app
| * \ \ \ \ \ am e247cdec: Merge "Update captive portal sign-in app SSL error page UI." ↵Paul Jensen2015-06-034-10/+70
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'e247cdec6db549035b67bb21fa08a4c6c73897d3': Update captive portal sign-in app SSL error page UI.
* | | | | | | | Make CaptivePortalLoginActivity compatible with setupwizard.Ramswaroop Ghanshyam Somani2016-02-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cyanogenmod setupwizard sends a token to validate when the result is sent. Handle this token. Issue-id: CYNGNOS-2048 Change-Id: I7b76e0df32288bf2efd60c495d6e726065353435
* | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96f3c5a41d3c52473c161aaf2c97d821caa99bb9
* | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: cmds/bootanimation/BootAnimation.cpp core/java/android/accounts/AccountManager.java core/java/android/app/AppOpsManager.java core/java/android/os/PowerManagerInternal.java core/java/android/os/storage/IMountService.java core/java/android/provider/Settings.java core/java/com/android/internal/widget/ILockSettings.aidl core/res/res/values-mcc204-mnc12/config.xml core/res/res/values-mcc219-mnc02/config.xml core/res/res/values-mcc730-mnc07/config.xml core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/systemui/doze/DozeService.java packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java services/core/java/com/android/server/LocationManagerService.java services/core/java/com/android/server/am/ActivityManagerService.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/power/PowerManagerService.java telecomm/java/android/telecom/Phone.java telephony/java/android/telephony/CarrierConfigManager.java telephony/java/android/telephony/RadioAccessFamily.java telephony/java/android/telephony/ServiceState.java telephony/java/android/telephony/SignalStrength.java telephony/java/android/telephony/TelephonyManager.java telephony/java/com/android/ims/ImsCallProfile.java telephony/java/com/android/ims/ImsReasonInfo.java telephony/java/com/android/ims/ImsSuppServiceNotification.aidl telephony/java/com/android/ims/ImsSuppServiceNotification.java telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl telephony/java/com/android/internal/telephony/RILConstants.java Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+11
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28973f9307de9323e13d9ef26b0fd652a8ffb578 Auto-generated-cl: translation import
* | | | | | | | CaptivePortalLogin: Allow overriding of progress colorcretin452015-10-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6246b8b354c124dc672efb1f18492c133208660d
* | | | | | | | CaptivePortalLogin: Add functionality for SetupWizardcretin452015-10-262-0/+31
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ccb7ee5e8882acfaa6afc5cd9efa9211058ed60
* | | | | | | 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.
generated by cgit v1.1 at 2025-01-08 17:54:09 +0000