diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-07-18 17:40:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-18 17:40:43 +0000 |
| commit | 332bf0e2cded256c0958c4e183f77c351fad09d4 (patch) | |
| tree | b72b688ae06b30b4a9aff8e834023e4ef7a40003 /packages | |
| parent | 59ac42915aa067a17bc197931a1826abc33f27ed (diff) | |
| parent | 139d894741bd011d8b97b58eac033234a964dfcb (diff) | |
| download | frameworks_base-332bf0e2cded256c0958c4e183f77c351fad09d4.zip frameworks_base-332bf0e2cded256c0958c4e183f77c351fad09d4.tar.gz frameworks_base-332bf0e2cded256c0958c4e183f77c351fad09d4.tar.bz2 | |
am ce4384aa: am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev
* commit 'ce4384aa1aa4e94967f9a81ac740f2e435d1ba37':
Make back button work in CaptivePortalLogin app like a web browser.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 2c1db02..09525b2 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -97,6 +97,16 @@ public class CaptivePortalLoginActivity extends Activity { } @Override + public void onBackPressed() { + WebView myWebView = (WebView) findViewById(R.id.webview); + if (myWebView.canGoBack()) { + myWebView.goBack(); + } else { + super.onBackPressed(); + } + } + + @Override public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); if (id == R.id.action_use_network) { |