commit d185d2670cdefb9a6a51f37cfd8e4b8ff69648be
author android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:23:59 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 28 20:23:59 2020 +0000
tree 5cfa9a8e8cc4e4a7cf135003edb672a34b7e0dea
parent 85644898578ea9d3dfd533ee40cbf0d06e158e30
parent d3fd85f8864e38f094300d63a30b3a89419c270e

Snap for 6439596 from d3fd85f8864e38f094300d63a30b3a89419c270e to qt-aml-tzdata-release

Change-Id: I48ad320549fbbf6a72d156a9d9e8a3c7f73d9121

src/com/android/htmlviewer/HTMLViewerActivity.java

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.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 @@
         s.setDefaultTextEncodingName("utf-8");
 
         mIntent = getIntent();
+        setBackButton();
         loadUrl();
     }
 
@@ -88,6 +89,21 @@
         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();