OSDN Git Service

Fix captive portal login ssl error overflow
authorHugo Benichi <hugobenichi@google.com>
Fri, 2 Jun 2017 01:12:09 +0000 (10:12 +0900)
committerHugo Benichi <hugobenichi@google.com>
Mon, 5 Jun 2017 03:55:25 +0000 (12:55 +0900)
commitc991275325bfcae7237d1dcecd60530acddca114
treeada5977dd37039fc588c675d33da2efc440ac9a2
parent5228e5d0cb0e23828e37cd9d8c237f8c97c72c26
Fix captive portal login ssl error overflow

This patch fixes the built-in html page shown in the captive portal
login activity when there is an ssl error. The page is now scaled
correctly with respect to the device screen, and text wraps as
expected.

This patch also cleanups the hardcoded page by:
 - formatting it for better reading,
 - inlining the "px" css rules,
 - using string concatenation instead of format for including the
   localized text.

Bug: 62269512
Bug: 36532213
Test: manually triggered the activity to load the error page
Merged-In: I9d037222798bd9d4c1736923afb71e3e14c68bcc

(cherry pick from commit 60d5f46d89038a6a46c38ac0e57d0762a67732cb)

Change-Id: I5cb6e53f5af9dc4b93be8da1d9b6e0e8958e561f
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java