Document window: Back arrow finish activity, closes #1165, by @gsantner

gsantner · Feb 28, 2021 · d7b2a13 · d7b2a13
1 parent e844d77
commit d7b2a13
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java
@@ -149,7 +149,7 @@ protected int getLayoutResId() {
         return R.layout.document__fragment__edit;
     }
 
-    @SuppressLint("SetJavaScriptEnabled")
+    @SuppressLint({"SetJavaScriptEnabled", "WrongConstant"})
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -205,7 +205,9 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         }
 
         // Do not need to send contents to accessibility
-        _hlEditor.setImportantForAccessibility(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            _hlEditor.setImportantForAccessibility(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
+        }
     }
 
     @Override
@@ -415,6 +417,12 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 }
                 return true;
             }
+            case android.R.id.home: {
+                if (saveDocument() && getActivity() != null) {
+                    getActivity().onBackPressed();
+                }
+                return true;
+            }
             case R.id.action_share_image:
             case R.id.action_share_pdf: {
                 if (saveDocument()) {