Merge QQ3A.200605.002 into master

Bug: 158095402
Merged-In: I484ad3f0dee9c4ee7ffa9ef81256a30263dd8f1c
Change-Id: I50baca8ad154cb2e15e4f0d39996de3085d10ac7

1 files changed, 17 insertions, 1 deletions

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();