commit 572de9b518099f3f64edbe42bf3f7d768e3ce720
author Karsten Tausche <karsten@fairphone.com> Thu Aug 26 18:19:22 2021 +0200
committer Karsten Tausche <karsten@fairphone.com> Thu Aug 26 18:19:22 2021 +0200
tree 5cfa9a8e8cc4e4a7cf135003edb672a34b7e0dea
parent 24997ff7ca0986e0a8b7c0b11d7cdb3edeabe68c
parent d4ec8108e8c7f43a6aef8a5884e5bc8f37248694

Merge tag 'android-security-10.0.0_r53' into int/10/fp2

Android security 10.0.0 release 53

* tag 'android-security-10.0.0_r53':

Change-Id: I9f81e1a202047ab000fdaf9dd5bbf0fc8eef0feb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 660c625..655127b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
             android:supportsRtl="true">
         <activity android:name="HTMLViewerActivity"
                 android:label="@string/app_label"
-                android:theme="@android:style/Theme.DeviceDefault">
+                android:theme="@android:style/Theme.DeviceDefault.Settings">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.VIEW" />

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