From d3fd85f8864e38f094300d63a30b3a89419c270e Mon Sep 17 00:00:00 2001
From: JianYang Liu <jianyliu@google.com>
Date: Thu, 23 Jan 2020 10:54:17 -0800
Subject: Enabled back button for HTMLViewer activity. This allows users to
 exit the activity easily without having to go through hardware/software back
 buttons.

Bug: 143491123, 146164760
Test: Manual
Change-Id: Id248fb01882c668a752d1dde871e9a7bf2d63431
(cherry picked from commit 2b81eb2d44667c02d5d614f20cbf0ef3652844a1)
Merged-In: : Id248fb01882c668a752d1dde871e9a7bf2d63431
---
 src/com/android/htmlviewer/HTMLViewerActivity.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/com/android/htmlviewer/HTMLViewerActivity.java b/src/com/android/htmlviewer/HTMLViewerActivity.java
index 87f75ae..85a16aa 100644
--- a/src/com/android/htmlviewer/HTMLViewerActivity.java
+++ b/src/com/android/htmlviewer/HTMLViewerActivity.java
@@ -20,11 +20,11 @@ import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Browser;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceRequest;
@@ -78,6 +78,7 @@ public class HTMLViewerActivity extends Activity {
         s.setDefaultTextEncodingName("utf-8");
 
         mIntent = getIntent();
+        setBackButton();
         loadUrl();
     }
 
@@ -88,6 +89,21 @@ public class HTMLViewerActivity extends Activity {
         mWebView.loadUrl(String.valueOf(mIntent.getData()));
     }
 
+    private void setBackButton() {
+        if (getActionBar() != null) {
+            getActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
-- 
cgit v1.2.3