diff --git a/app/src/androidTest/java/com/github/cvzi/screenshottile/activities/MainActivityTest.kt b/app/src/androidTest/java/com/github/cvzi/screenshottile/activities/MainActivityTest.kt
index 91b98faf8..456b0da91 100644
--- a/app/src/androidTest/java/com/github/cvzi/screenshottile/activities/MainActivityTest.kt
+++ b/app/src/androidTest/java/com/github/cvzi/screenshottile/activities/MainActivityTest.kt
@@ -1,3 +1,5 @@
+package com.github.cvzi.screenshottile.activities
+
 import android.view.View
 import android.view.ViewGroup
 import androidx.test.espresso.Espresso.onView
@@ -9,7 +11,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import com.github.cvzi.screenshottile.R
-import com.github.cvzi.screenshottile.activities.MainActivity
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.`is`
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bb9eaf003..65d506957 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,7 +50,8 @@
     <application
         android:name="com.github.cvzi.screenshottile.App"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules"
+        android:fullBackupContent="@xml/backup_rules_old"
+        android:dataExtractionRules="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -220,6 +221,20 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/floating_button_widget" />
         </receiver>
+        <service android:name=".assist.MyVoiceInteractionService"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_VOICE_INTERACTION"
+            android:exported="true">
+            <meta-data android:name="android.voice_interaction"
+                android:resource="@xml/interaction_service" />
+            <intent-filter>
+                <action android:name="android.service.voice.VoiceInteractionService" />
+            </intent-filter>
+        </service>
+        <service android:name=".assist.MyVoiceInteractionSessionService"
+            android:permission="android.permission.BIND_VOICE_INTERACTION">
+        </service>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/App.java b/app/src/main/java/com/github/cvzi/screenshottile/App.java
index 1d3aa0c39..64e2bb57d 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/App.java
+++ b/app/src/main/java/com/github/cvzi/screenshottile/App.java
@@ -212,8 +212,8 @@ protected void attachBaseContext(Context base) {
     public void onCreate() {
         super.onCreate();
 
+        /*
         if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
             StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
                     .detectNetwork()
                     .detectCustomSlowCalls()
@@ -222,14 +222,17 @@ public void onCreate() {
                     .penaltyLog()
                     .penaltyDialog()
                     .build());
-/*
+
             StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
                     .detectAll()
                     .penaltyLog()
                     //.penaltyDeath()
                     .build());
-
-*/
+        }
+        */
+        if(!BuildConfig.DEBUG) {
+            StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
+            StrictMode.setVmPolicy(builder.build());
         }
 
         PreferenceManager.setDefaultValues(this, R.xml.pref, false);
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/NotificationActionReceiver.kt b/app/src/main/java/com/github/cvzi/screenshottile/NotificationActionReceiver.kt
index 582453dbe..8fd1eeea9 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/NotificationActionReceiver.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/NotificationActionReceiver.kt
@@ -13,10 +13,7 @@ import android.view.Display
 import android.widget.Toast
 import com.github.cvzi.screenshottile.services.BasicForegroundService
 import com.github.cvzi.screenshottile.services.ScreenshotTileService
-import com.github.cvzi.screenshottile.utils.deleteImage
-import com.github.cvzi.screenshottile.utils.editImageChooserIntent
-import com.github.cvzi.screenshottile.utils.hideNotification
-import com.github.cvzi.screenshottile.utils.shareImageChooserIntent
+import com.github.cvzi.screenshottile.utils.*
 
 
 const val NOTIFICATION_ACTION_SHARE = "NOTIFICATION_ACTION_SHARE"
@@ -73,19 +70,11 @@ class NotificationActionReceiver : BroadcastReceiver() {
 
                     val path = Uri.parse(intent.getStringExtra(NOTIFICATION_ACTION_DATA_URI))
 
+
                     if (path != null && deleteImage(this, path)) {
-                        Toast.makeText(
-                            windowContext,
-                            context.getString(R.string.screenshot_deleted),
-                            Toast.LENGTH_SHORT
-                        ).show()
+                        windowContext.toastMessage(R.string.screenshot_deleted, ToastType.SUCCESS, Toast.LENGTH_SHORT)
                     } else {
-                        Toast.makeText(
-                            windowContext,
-                            context.getString(R.string.screenshot_delete_failed),
-                            Toast.LENGTH_LONG
-                        )
-                            .show()
+                        windowContext.toastMessage(R.string.screenshot_delete_failed, ToastType.ERROR)
                     }
                 }
                 NOTIFICATION_ACTION_EDIT -> {
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/activities/AcquireScreenshotPermission.kt b/app/src/main/java/com/github/cvzi/screenshottile/activities/AcquireScreenshotPermission.kt
index 394dff77a..0181cadd3 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/activities/AcquireScreenshotPermission.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/activities/AcquireScreenshotPermission.kt
@@ -8,12 +8,13 @@ import android.content.pm.PackageManager
 import android.media.projection.MediaProjectionManager
 import android.os.Bundle
 import android.util.Log
-import android.widget.Toast
 import com.github.cvzi.screenshottile.App
 
 import com.github.cvzi.screenshottile.App.setScreenshotPermission
 import com.github.cvzi.screenshottile.BuildConfig
 import com.github.cvzi.screenshottile.R
+import com.github.cvzi.screenshottile.utils.ToastType
+import com.github.cvzi.screenshottile.utils.toastMessage
 
 
 /**
@@ -94,10 +95,7 @@ class AcquireScreenshotPermission : Activity() {
                     TAG,
                     "onActivityResult() No screen capture permission: resultCode==$resultCode"
                 )
-                Toast.makeText(
-                    this,
-                    getString(R.string.permission_missing_screen_capture), Toast.LENGTH_LONG
-                ).show()
+                toastMessage(getString(R.string.permission_missing_screen_capture), ToastType.ERROR)
             }
         }
         finish()
@@ -126,10 +124,7 @@ class AcquireScreenshotPermission : Activity() {
                     TAG,
                     "onRequestPermissionsResult() Expected PERMISSION_GRANTED for WRITE_EXTERNAL_STORAGE"
                 )
-                Toast.makeText(
-                    this,
-                    getString(R.string.permission_missing_external_storage), Toast.LENGTH_LONG
-                ).show()
+                toastMessage(getString(R.string.permission_missing_external_storage), ToastType.ERROR)
             }
         }
         finish()
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/activities/MainActivity.kt b/app/src/main/java/com/github/cvzi/screenshottile/activities/MainActivity.kt
index b523c6ba4..55792dbfc 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/activities/MainActivity.kt
@@ -1,7 +1,9 @@
 package com.github.cvzi.screenshottile.activities
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
@@ -16,6 +18,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.github.cvzi.screenshottile.App
 import com.github.cvzi.screenshottile.R
+import com.github.cvzi.screenshottile.assist.MyVoiceInteractionService
 import com.github.cvzi.screenshottile.services.ScreenshotAccessibilityService
 import com.github.cvzi.screenshottile.utils.hasFdroid
 import com.github.cvzi.screenshottile.utils.isNewAppInstallation
@@ -72,6 +75,7 @@ class MainActivity : AppCompatActivity() {
 
         val switchLegacy = findViewById<SwitchMaterial>(R.id.switchLegacy)
         val switchNative = findViewById<SwitchMaterial>(R.id.switchNative)
+        val switchAssist = findViewById<SwitchMaterial>(R.id.switchAssist)
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
             findViewById<LinearLayout>(R.id.linearLayoutNative)?.let {
@@ -119,7 +123,9 @@ class MainActivity : AppCompatActivity() {
 
         findViewById<Button>(R.id.buttonAccessibilitySettings)?.setOnClickListener {
             // Open Accessibility settings
-            ScreenshotAccessibilityService.openAccessibilitySettings(this, TAG)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                ScreenshotAccessibilityService.openAccessibilitySettings(this, TAG)
+            }
         }
 
         findViewById<TextView>(R.id.textDescGeneral)?.run {
@@ -139,6 +145,12 @@ class MainActivity : AppCompatActivity() {
                 hintAccessibilityServiceUnavailable?.let {
                     (it.parent as? ViewGroup)?.removeView(it)
                 }
+            } else if (packageManager.checkPermission(
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                    packageName
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
+                App.requestStoragePermission(this, false)
             }
 
         }
@@ -154,9 +166,8 @@ class MainActivity : AppCompatActivity() {
                 updateFloatButton()
                 switchLegacy?.isChecked = !App.getInstance().prefManager.useNative
                 if (App.getInstance().prefManager.useNative) {
-                    if (ScreenshotAccessibilityService.instance == null) {
-                        // Open Accessibility settings
-                        ScreenshotAccessibilityService.openAccessibilitySettings(this, TAG)
+                    if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && ScreenshotAccessibilityService.instance == null) {
+                        // Open Accessibility settings ScreenshotAccessibilityService.openAccessibilitySettings(this, TAG)
                     } else {
                         hintAccessibilityServiceUnavailable?.let {
                             (it.parent as? ViewGroup)?.removeView(it)
@@ -165,6 +176,10 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
+
+        switchAssist?.setOnCheckedChangeListener { _, _ ->
+            MyVoiceInteractionService.openVoiceInteractionSettings(this, TAG)
+        }
     }
 
     private fun askToEnableAccessibility() {
@@ -216,11 +231,12 @@ class MainActivity : AppCompatActivity() {
     private fun updateSwitches() {
         val switchLegacy = findViewById<SwitchMaterial>(R.id.switchLegacy)
         val switchNative = findViewById<SwitchMaterial>(R.id.switchNative)
+        val switchAssist = findViewById<SwitchMaterial>(R.id.switchAssist)
 
         switchLegacy?.isChecked = !App.getInstance().prefManager.useNative
         switchNative?.isChecked = App.getInstance().prefManager.useNative
 
-        if (App.getInstance().prefManager.useNative) {
+        if (App.getInstance().prefManager.useNative && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             if (ScreenshotAccessibilityService.instance == null && hintAccessibilityServiceUnavailable == null) {
                 findViewById<LinearLayout>(R.id.linearLayoutNative)?.let {
                     hintAccessibilityServiceUnavailable = TextView(this)
@@ -244,6 +260,9 @@ class MainActivity : AppCompatActivity() {
                 hintAccessibilityServiceUnavailable = null
             }
         }
+
+        switchAssist?.isChecked = MyVoiceInteractionService.instance != null
+
     }
 
     private fun makeActivityClickable(textView: TextView) {
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/activities/NoDisplayActivity.java b/app/src/main/java/com/github/cvzi/screenshottile/activities/NoDisplayActivity.java
index 962e1d470..afdf25358 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/activities/NoDisplayActivity.java
+++ b/app/src/main/java/com/github/cvzi/screenshottile/activities/NoDisplayActivity.java
@@ -2,6 +2,7 @@
 
 import static com.github.cvzi.screenshottile.BuildConfig.APPLICATION_ID;
 import static com.github.cvzi.screenshottile.utils.UtilsKt.screenshot;
+import static com.github.cvzi.screenshottile.utils.UtilsKt.toastMessage;
 
 import android.app.Activity;
 import android.content.Context;
@@ -17,6 +18,7 @@
 import com.github.cvzi.screenshottile.services.BasicForegroundService;
 import com.github.cvzi.screenshottile.services.ScreenshotAccessibilityService;
 import com.github.cvzi.screenshottile.services.ScreenshotTileService;
+import com.github.cvzi.screenshottile.utils.ToastType;
 
 /**
  * Empty activity that is used to collapse the quick settings panel, finishes itself in onCreate
@@ -139,7 +141,7 @@ protected void onCreate(Bundle savedInstanceState) {
                         }
                     }
                 } else {
-                    Toast.makeText(this, R.string.setting_floating_button_unsupported, Toast.LENGTH_LONG).show();
+                    toastMessage(this, R.string.setting_floating_button_unsupported, ToastType.ERROR, Toast.LENGTH_LONG);
                 }
             } else {
                 if (BuildConfig.DEBUG) Log.v(TAG, "onCreate() no valid action or EXTRA_* found");
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/activities/TakeScreenshotActivity.kt b/app/src/main/java/com/github/cvzi/screenshottile/activities/TakeScreenshotActivity.kt
index 332c48911..d88e20c06 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/activities/TakeScreenshotActivity.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/activities/TakeScreenshotActivity.kt
@@ -83,6 +83,7 @@ class TakeScreenshotActivity : Activity(),
     private var saveImageResult: SaveImageResult? = null
     private var partial = false
     private var isFullscreen = false
+    private var screenshotSelectorView: ScreenshotSelectorView? = null
 
     private var askedForPermission = false
 
@@ -93,6 +94,15 @@ class TakeScreenshotActivity : Activity(),
         super.onNewIntent(intent)
     }
 
+    override fun onBackPressed() {
+        val selectorView = screenshotSelectorView
+        if (partial && selectorView != null && !selectorView.defaultState) {
+            selectorView.reset()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         instance = this
@@ -159,7 +169,7 @@ class TakeScreenshotActivity : Activity(),
          * Show partial screenshot selector
          */
 
-        var mScreenshotSelectorView =
+        val mScreenshotSelectorView =
             findViewById<ScreenshotSelectorView?>(R.id.global_screenshot_selector)
         if (mScreenshotSelectorView != null) {
             // View is already loaded, stop here
@@ -169,7 +179,7 @@ class TakeScreenshotActivity : Activity(),
             } else {
                 // nothing selected -> reset the view
                 mScreenshotSelectorView.visibility = View.VISIBLE
-                mScreenshotSelectorView.invalidate()
+                mScreenshotSelectorView.reset()
             }
             return
         }
@@ -207,17 +217,27 @@ class TakeScreenshotActivity : Activity(),
                 WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
         }
 
-        mScreenshotSelectorView = findViewById(R.id.global_screenshot_selector)
-        mScreenshotSelectorView.text = getString(R.string.take_screenshot)
-        mScreenshotSelectorView.shutter = R.drawable.ic_stat_name
-        mScreenshotSelectorView.onShutter = {
-            // If there is a cutout or status bars, the view might have a offset
-            val selectorViewOffset = intArrayOf(0, 0)
-            mScreenshotSelectorView.getLocationOnScreen(selectorViewOffset)
-            it.offset(selectorViewOffset[0], selectorViewOffset[1])
-            cutOutRect = it
-            mScreenshotSelectorView.visibility = View.GONE
-            prepareForScreenSharing()
+        findViewById<ScreenshotSelectorView>(R.id.global_screenshot_selector).apply {
+            screenshotSelectorView = this
+            text = getString(R.string.take_screenshot)
+            shutter = R.drawable.ic_stat_name
+            fullScreenIcon = R.drawable.ic_fullscreen
+            onShutter = {
+                // If there is a cutout or status bars, the view might have a offset
+                val selectorViewOffset = intArrayOf(0, 0)
+                getLocationOnScreen(selectorViewOffset)
+                it.offset(selectorViewOffset[0], selectorViewOffset[1])
+                cutOutRect = it
+                visibility = View.GONE
+                if (App.getInstance().prefManager.selectAreaShutterDelay > 0) {
+                    Handler(Looper.getMainLooper()).postDelayed({
+                        prepareForScreenSharing()
+                    }, App.getInstance().prefManager.selectAreaShutterDelay)
+                } else {
+                    prepareForScreenSharing()
+                }
+            }
+            reset()
         }
 
         // make sure that a foreground service runs
@@ -231,12 +251,6 @@ class TakeScreenshotActivity : Activity(),
     }
 
     override fun onAcquireScreenshotPermission(isNewPermission: Boolean) {
-        /*
-        Handler().postDelayed({
-            // Wait so the notification area is really collapsed
-            shareScreen()
-         }, 350)
-        */
         ScreenshotTileService.instance?.onAcquireScreenshotPermission(isNewPermission)
         ScreenshotTileService.instance?.foreground()
         BasicForegroundService.instance?.foreground()
@@ -247,7 +261,7 @@ class TakeScreenshotActivity : Activity(),
                 // Wait a little bit, so the permission dialog can fully hide itself
                 Handler(Looper.getMainLooper()).postDelayed({
                     prepareForScreenSharing()
-                }, 300)
+                }, App.getInstance().prefManager.originalAfterPermissionDelay)
             } else {
                 prepareForScreenSharing()
             }
@@ -298,7 +312,7 @@ class TakeScreenshotActivity : Activity(),
                 null
             }
             if (mediaProjection == null) {
-                screenShotFailedToast("Failed to create MediaProjection")
+                screenShotFailedToast("Failed to create MediaProjection", Toast.LENGTH_SHORT)
                 // Something went wrong, restart everything
                 finish()
                 App.getInstance().screenshot(this)
@@ -310,16 +324,19 @@ class TakeScreenshotActivity : Activity(),
         } catch (e: SecurityException) {
             Log.e(TAG, "startVirtualDisplay() SecurityException: $e")
             setScreenshotPermission(null)
-            screenShotFailedToast("Failed to start virtual display: ${e.localizedMessage}")
+            screenShotFailedToast("Failed to start virtual display: ${e.localizedMessage}", Toast.LENGTH_SHORT)
             stopScreenSharing()
 
             // Start the foreground service and get a new media projection
-            resetMediaProjection()
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                BasicForegroundService.resumeScreenshot(this)
-            } else {
-                App.acquireScreenshotPermission(this, this)
-            }
+            Handler(Looper.getMainLooper()).postDelayed({
+                resetMediaProjection()
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    BasicForegroundService.resumeScreenshot(this)
+                } else {
+                    App.acquireScreenshotPermission(this, this)
+                }
+            }, App.getInstance().prefManager.failedVirtualDisplayDelay)
+
         }
     }
 
@@ -422,6 +439,8 @@ class TakeScreenshotActivity : Activity(),
             return
         }
 
+        aMessage(this)
+
         val result = saveImageResult as? SaveImageResultSuccess?
 
         when {
@@ -435,10 +454,7 @@ class TakeScreenshotActivity : Activity(),
                 if (result.dummyPath.isNotEmpty()) {
                     dummyPath = result.dummyPath
                 }
-                Toast.makeText(
-                    this,
-                    getString(R.string.screenshot_file_saved, dummyPath), Toast.LENGTH_LONG
-                ).show()
+                toastMessage(getString(R.string.screenshot_file_saved, dummyPath), ToastType.SUCCESS)
 
                 createNotification(
                     this,
@@ -454,10 +470,7 @@ class TakeScreenshotActivity : Activity(),
                 val uri = Uri.fromFile(result.file)
                 val path = result.file.absolutePath
 
-                Toast.makeText(
-                    this,
-                    getString(R.string.screenshot_file_saved, path), Toast.LENGTH_LONG
-                ).show()
+                toastMessage(getString(R.string.screenshot_file_saved, path), ToastType.SUCCESS)
 
                 createNotification(
                     this,
@@ -497,13 +510,13 @@ class TakeScreenshotActivity : Activity(),
         )
     }
 
-    private fun screenShotFailedToast(errorMessage: String? = null) {
+    private fun screenShotFailedToast(errorMessage: String? = null, duration: Int = Toast.LENGTH_LONG) {
         val message = getString(R.string.screenshot_failed) + if (errorMessage != null) {
             "\n$errorMessage"
         } else {
             ""
         }
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+        toastMessage(message, ToastType.ERROR, duration)
     }
 
 }
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/activities/TutorialActivity.kt b/app/src/main/java/com/github/cvzi/screenshottile/activities/TutorialActivity.kt
index 23c690a8c..17ac52f6c 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/activities/TutorialActivity.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/activities/TutorialActivity.kt
@@ -1,5 +1,6 @@
 package com.github.cvzi.screenshottile.activities
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
@@ -131,6 +132,7 @@ class TutorialActivity : AppCompatActivity() {
             }
 
             override fun onPageSelected(position: Int) {
+                @SuppressLint("SetTextI18n")
                 textViewStep.text = (position + 1).toString()
                 textViewFooter.text = if (position >= 0 && position < descriptions.size) {
                     getString(descriptions[position])
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionService.kt b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionService.kt
new file mode 100644
index 000000000..6e57bac26
--- /dev/null
+++ b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionService.kt
@@ -0,0 +1,66 @@
+package com.github.cvzi.screenshottile.assist
+
+import android.Manifest
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.provider.Settings
+import android.service.voice.VoiceInteractionService
+import com.github.cvzi.screenshottile.App
+import com.github.cvzi.screenshottile.R
+import com.github.cvzi.screenshottile.activities.MainActivity
+import com.github.cvzi.screenshottile.activities.NoDisplayActivity
+import com.github.cvzi.screenshottile.activities.SettingsActivity
+import com.github.cvzi.screenshottile.fragments.SettingFragment
+
+class MyVoiceInteractionService : VoiceInteractionService() {
+    companion object {
+        var instance: MyVoiceInteractionService? = null
+
+        /**
+         * Open assistant settings from activity
+         */
+        fun openVoiceInteractionSettings(context: Activity, returnTo: String? = null) {
+            Intent(Settings.ACTION_VOICE_INPUT_SETTINGS).apply {
+                if (resolveActivity(context.packageManager) != null) {
+                    if (returnTo != null) {
+                        App.getInstance().prefManager.returnIfVoiceInteractionServiceEnabled =
+                            returnTo
+                    }
+                    context.startActivity(this)
+                }
+            }
+        }
+    }
+
+    override fun onReady() {
+        super.onReady()
+        instance = this
+        when (App.getInstance().prefManager.returnIfVoiceInteractionServiceEnabled) {
+            SettingFragment.TAG -> {
+                // Return to settings
+                App.getInstance().prefManager.returnIfVoiceInteractionServiceEnabled = null
+                SettingsActivity.startNewTask(this)
+            }
+            MainActivity.TAG -> {
+                // Return to main activity
+                App.getInstance().prefManager.returnIfVoiceInteractionServiceEnabled = null
+                MainActivity.startNewTask(this)
+            }
+            NoDisplayActivity.TAG -> {
+                // Return to NoDisplayActivity activity i.e. finish()
+                App.getInstance().prefManager.returnIfVoiceInteractionServiceEnabled = null
+                NoDisplayActivity.startNewTask(this, false)
+            }
+        }
+
+        if (App.getInstance().prefManager.voiceInteractionAction != getString(R.string.setting_voice_interaction_action_value_native) &&
+            packageManager.checkPermission(
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                packageName
+            ) != PackageManager.PERMISSION_GRANTED
+        ) {
+            App.requestStoragePermission(this, false)
+        }
+    }
+}
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSession.kt b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSession.kt
new file mode 100644
index 000000000..99213875d
--- /dev/null
+++ b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSession.kt
@@ -0,0 +1,299 @@
+package com.github.cvzi.screenshottile.assist
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.graphics.Rect
+import android.net.Uri
+import android.os.*
+import android.service.voice.VoiceInteractionSession
+import android.util.Log
+import android.view.View
+import android.view.WindowInsets
+import android.view.WindowManager
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.github.cvzi.screenshottile.App
+import com.github.cvzi.screenshottile.BuildConfig
+import com.github.cvzi.screenshottile.R
+import com.github.cvzi.screenshottile.activities.NoDisplayActivity
+import com.github.cvzi.screenshottile.activities.TakeScreenshotActivity
+import com.github.cvzi.screenshottile.partial.ScreenshotSelectorView
+import com.github.cvzi.screenshottile.services.ScreenshotAccessibilityService
+import com.github.cvzi.screenshottile.utils.*
+import java.lang.ref.WeakReference
+
+
+class MyVoiceInteractionSession(context: Context) : VoiceInteractionSession(context) {
+    companion object {
+        private const val TAG = "MyVoiceInSession"
+    }
+
+    private var handler = SaveImageHandler(this, Looper.getMainLooper())
+    private var thread: Thread? = null
+    private var saveImageResult: SaveImageResult? = null
+    private val prefManager = App.getInstance().prefManager
+    private var screenshotSelectorActive = false
+    private var layoutView: ConstraintLayout? = null
+    private var screenshotSelectorView: ScreenshotSelectorView? = null
+    private var cutOutRect: Rect? = null
+    private var currentBitmap: Bitmap? = null
+
+    override fun onBackPressed() {
+        val selectorView = screenshotSelectorView
+        if (screenshotSelectorActive && selectorView != null && !selectorView.defaultState) {
+            selectorView.reset()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    override fun onHandleScreenshot(bitmap: Bitmap?) {
+        if (bitmap == null) {
+            Log.w(TAG, "onHandleScreenshot: bitmap is null")
+        }
+
+        screenshotSelectorActive = false
+
+        if (thread?.isAlive == true) {
+            Log.e(TAG, "onHandleScreenshot: Thread is already running")
+            hide()
+            return
+        }
+
+        // Partial screenshot -> Show "crop bitmap view"
+        cutOutRect = null
+        if (bitmap != null && prefManager.voiceInteractionAction == context.getString(R.string.setting_voice_interaction_action_value_partial)) {
+            currentBitmap = bitmap
+            showCropBitmapView(bitmap)
+            return
+        } else {
+            currentBitmap = null
+        }
+
+        // If action is native screenshot, try to take screenshot with accessibility service
+        var success = false
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P &&
+            ScreenshotAccessibilityService.instance != null &&
+            (bitmap == null || prefManager.voiceInteractionAction == context.getString(R.string.setting_voice_interaction_action_value_native))
+        ) {
+            if(BuildConfig.DEBUG) Log.v(TAG, "onHandleScreenshot: simulateScreenshotButton()")
+            success = ScreenshotAccessibilityService.instance?.simulateScreenshotButton(
+                autoHideButton = true,
+                autoUnHideButton = true,
+                useTakeScreenshotMethod = false
+            ) == true
+        }
+        if (success) {
+            hide()
+            return
+        }
+
+        if (bitmap == null) {
+            Log.w(TAG, "onHandleScreenshot: Trying original screenshot method as last resort")
+            context.startActivity(NoDisplayActivity.newIntent(context, true))
+            hide()
+        } else {
+            if(BuildConfig.DEBUG) Log.v(TAG, "onHandleScreenshot: storeBitmap(bitmap)")
+            storeBitmap(bitmap)
+        }
+    }
+
+    @SuppressLint("InflateParams")
+    override fun onCreateContentView(): View {
+        val constraintLayout = layoutInflater.inflate(R.layout.image_crop, null) as ConstraintLayout
+        screenshotSelectorView =
+            constraintLayout.findViewById(R.id.global_screenshot_selector) as ScreenshotSelectorView
+        screenshotSelectorView?.run {
+            visibility = View.GONE
+            text = context.getString(R.string.take_screenshot)
+            shutter = R.drawable.ic_stat_name
+            fullScreenIcon = R.drawable.ic_fullscreen
+            onShutter = {
+                val bitmap = currentBitmap
+                if (bitmap != null) {
+                    // If there is a cutout or status bars, the view might have a offset
+                    val selectorViewOffset = intArrayOf(0, 0)
+                    getLocationOnScreen(selectorViewOffset)
+                    it.offset(selectorViewOffset[0], selectorViewOffset[1])
+                    cutOutRect = it
+                    visibility = View.GONE
+                    storeBitmap(bitmap)
+                    screenshotSelectorActive = false
+                }
+            }
+        }
+
+
+        layoutView = constraintLayout
+        return constraintLayout
+    }
+
+    /**
+     * Show a view that let's the user crop the screenshot after the fact
+     */
+    private fun showCropBitmapView(bitmap: Bitmap) {
+        goFullscreen()
+
+        if (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) {
+            // Night Mode
+            layoutView?.setBackgroundColor(Color.BLACK)
+        } else {
+            layoutView?.setBackgroundColor(Color.WHITE)
+        }
+
+        screenshotSelectorView?.run {
+            screenshotSelectorActive = true
+            this.bitmap = if (BuildConfig.DEBUG) {
+                tintImage(bitmap, color = 0xFF006622)
+            } else {
+                bitmap
+            }
+            visibility = View.VISIBLE
+            reset()
+        }
+
+    }
+
+    private fun goFullscreen() {
+        closeSystemDialogs()
+
+        window.window?.let { window ->
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                window.insetsController?.hide(WindowInsets.Type.statusBars())
+            } else {
+                @Suppress("DEPRECATION")
+                window.setFlags(
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                    WindowManager.LayoutParams.FLAG_FULLSCREEN
+                )
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                window.statusBarColor = Color.TRANSPARENT
+                window.setDecorFitsSystemWindows(true)
+            } else {
+                @Suppress("DEPRECATION")
+                window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                window.attributes.layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            }
+        }
+    }
+
+
+    /**
+     * Store the bitmap to file system in a separate thread
+     */
+    private fun storeBitmap(bitmap: Bitmap) {
+        thread = Thread {
+            saveImageResult = saveBitmapToFile(
+                context,
+                bitmap,
+                prefManager.fileNamePattern,
+                compressionPreference(context),
+                cutOutRect
+            )
+            handler.sendEmptyMessage(TakeScreenshotActivity.THREAD_FINISHED)
+        }
+        handler.sendEmptyMessage(TakeScreenshotActivity.THREAD_START)
+    }
+
+    /**
+     * Handle messages from/to service/thread
+     */
+    class SaveImageHandler(myVoiceInteractionSession: MyVoiceInteractionSession, looper: Looper) :
+        Handler(looper) {
+        private var service: WeakReference<MyVoiceInteractionSession> =
+            WeakReference(myVoiceInteractionSession)
+
+        override fun handleMessage(msg: Message) {
+            super.handleMessage(msg)
+            if (msg.what == TakeScreenshotActivity.THREAD_START) {
+                service.get()?.thread?.start()
+            } else if (msg.what == TakeScreenshotActivity.THREAD_FINISHED) {
+                service.get()?.onFileSaved()
+            }
+        }
+    }
+
+    private fun onFileSaved() {
+        currentBitmap = null
+        val saveImageResult = this.saveImageResult
+        if (saveImageResult == null) {
+            screenShotFailedToast("saveImageResult is null")
+            hide()
+            return
+        }
+        if (!saveImageResult.success) {
+            screenShotFailedToast(saveImageResult.errorMessage)
+            hide()
+            return
+        }
+
+        aMessage(context)
+
+        val screenDensity = context.resources.configuration.densityDpi
+
+        val result = saveImageResult as? SaveImageResultSuccess?
+
+        when {
+            result == null -> {
+                screenShotFailedToast("Failed to cast SaveImageResult")
+            }
+            result.uri != null -> {
+                // Android Q+ works with MediaStore content:// URI
+                var dummyPath =
+                    "${Environment.DIRECTORY_PICTURES}/${TakeScreenshotActivity.SCREENSHOT_DIRECTORY}/${result.fileTitle}"
+                if (result.dummyPath.isNotEmpty()) {
+                    dummyPath = result.dummyPath
+                }
+                context.toastMessage(context.getString(R.string.screenshot_file_saved, dummyPath), ToastType.SUCCESS)
+
+                createNotification(
+                    context,
+                    result.uri,
+                    result.bitmap,
+                    screenDensity,
+                    result.mimeType
+                )
+                prefManager.screenshotCount++
+            }
+            result.file != null -> {
+                // Legacy behaviour until Android P, works with the real file path
+                val uri = Uri.fromFile(result.file)
+                val path = result.file.absolutePath
+
+                context.toastMessage(context.getString(R.string.screenshot_file_saved, path), ToastType.SUCCESS)
+
+                createNotification(
+                    context,
+                    uri,
+                    result.bitmap,
+                    screenDensity,
+                    result.mimeType
+                )
+                prefManager.screenshotCount++
+            }
+            else -> {
+                screenShotFailedToast("Failed to cast SaveImageResult path/uri")
+            }
+        }
+        hide()
+    }
+
+    private fun screenShotFailedToast(errorMessage: String? = null) {
+        val message = context.getString(R.string.screenshot_failed) + if (errorMessage != null) {
+            "\n$errorMessage"
+        } else {
+            ""
+        }
+        context.toastMessage(message, ToastType.ERROR)
+    }
+
+
+}
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSessionService.kt b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSessionService.kt
new file mode 100644
index 000000000..1d7dd71f0
--- /dev/null
+++ b/app/src/main/java/com/github/cvzi/screenshottile/assist/MyVoiceInteractionSessionService.kt
@@ -0,0 +1,11 @@
+package com.github.cvzi.screenshottile.assist
+
+import android.os.Bundle
+import android.service.voice.VoiceInteractionSession
+import android.service.voice.VoiceInteractionSessionService
+
+class MyVoiceInteractionSessionService : VoiceInteractionSessionService() {
+    override fun onNewSession(bundle: Bundle?): VoiceInteractionSession {
+        return MyVoiceInteractionSession(this)
+    }
+}
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingAdvancedFragment.kt b/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingAdvancedFragment.kt
new file mode 100644
index 000000000..0ba4143d2
--- /dev/null
+++ b/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingAdvancedFragment.kt
@@ -0,0 +1,58 @@
+package com.github.cvzi.screenshottile.fragments
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import androidx.preference.EditTextPreference
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
+import com.github.cvzi.screenshottile.R
+import java.util.*
+
+
+/**
+ * Created by cuzi (cuzi@openmail.cc) on 2022/03/19.
+ */
+class SettingAdvancedFragment : PreferenceFragmentCompat() {
+    companion object {
+        const val TAG = "SettingAdvancedFragment"
+    }
+
+    private var floatingButtonScalePref: EditTextPreference? = null
+    private var naggingToastsPref: SwitchPreference? = null
+    private var pref: SharedPreferences? = null
+
+    private val prefListener =
+        SharedPreferences.OnSharedPreferenceChangeListener { _: SharedPreferences?, key: String? ->
+            Log.v(TAG, "pref listener: $key")
+        }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        pref = preferenceManager.sharedPreferences
+
+        addPreferencesFromResource(R.xml.pref_advanced)
+
+        floatingButtonScalePref =
+            findPreference(getString(R.string.pref_key_floating_button_scale)) as EditTextPreference?
+        naggingToastsPref =
+            findPreference(getString(R.string.pref_key_nagging_toasts)) as SwitchPreference?
+
+        pref?.registerOnSharedPreferenceChangeListener(prefListener)
+    }
+
+
+    override fun onResume() {
+        super.onResume()
+
+        updateNaggingToasts()
+    }
+
+    private fun updateNaggingToasts() {
+        naggingToastsPref?.isVisible = Locale.getDefault().country == "RU"
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        pref?.unregisterOnSharedPreferenceChangeListener(prefListener)
+    }
+}
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingFragment.kt b/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingFragment.kt
index 1f9bc91a9..435b82981 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingFragment.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/fragments/SettingFragment.kt
@@ -18,14 +18,18 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
-import android.widget.*
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
 import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.commit
+import androidx.fragment.app.replace
 import androidx.preference.*
 import androidx.preference.Preference.OnPreferenceClickListener
 import com.github.cvzi.screenshottile.App
 import com.github.cvzi.screenshottile.BuildConfig
 import com.github.cvzi.screenshottile.R
 import com.github.cvzi.screenshottile.activities.MainActivity
+import com.github.cvzi.screenshottile.assist.MyVoiceInteractionService
 import com.github.cvzi.screenshottile.services.ScreenshotAccessibilityService
 import com.github.cvzi.screenshottile.services.ScreenshotAccessibilityService.Companion.openAccessibilitySettings
 import com.github.cvzi.screenshottile.utils.*
@@ -61,6 +65,7 @@ class SettingFragment : PreferenceFragmentCompat() {
     private var floatingButtonShutter: ListPreference? = null
     private var floatingButtonDelay: ListPreference? = null
     private var floatingButtonActionPref: ListPreference? = null
+    private var voiceInteractionActionPref: ListPreference? = null
     private var hideAppPref: SwitchPreference? = null
     private var storageDirectoryPref: Preference? = null
     private var fileNamePatternPref: EditTextPreference? = null
@@ -71,8 +76,8 @@ class SettingFragment : PreferenceFragmentCompat() {
     private var floatingButtonHideShowClosePreventRecursion = false
     private var pref: SharedPreferences? = null
     private val prefManager = App.getInstance().prefManager
-    var floatingButtonShowCloseAlertDialog: AlertDialog? = null
-    var floatingButtonShowCloseTextValue = ""
+    private var floatingButtonShowCloseAlertDialog: AlertDialog? = null
+    private var floatingButtonShowCloseTextValue = ""
 
     private val prefListener =
         SharedPreferences.OnSharedPreferenceChangeListener { _: SharedPreferences?, key: String? ->
@@ -93,7 +98,12 @@ class SettingFragment : PreferenceFragmentCompat() {
                 )
                 getString(R.string.pref_key_use_system_defaults) -> updateUseNative()
                 getString(R.string.pref_key_tile_action) -> updateTileActionSummary(prefManager.tileAction)
-                getString(R.string.pref_key_floating_action) -> updateFloatingActionSummary(prefManager.floatingButtonAction)
+                getString(R.string.pref_key_floating_action) -> updateFloatingActionSummary(
+                    prefManager.floatingButtonAction
+                )
+                getString(R.string.pref_key_voice_interaction_action) -> updateVoiceInteractionActionSummary(
+                    prefManager.voiceInteractionAction
+                )
                 getString(R.string.pref_key_dark_theme) -> updateDarkTheme(true)
             }
         }
@@ -127,11 +137,15 @@ class SettingFragment : PreferenceFragmentCompat() {
         floatingButtonDelay =
             findPreference(getString(R.string.pref_key_floating_button_delay)) as ListPreference?
         tileActionPref = findPreference(getString(R.string.pref_key_tile_action)) as ListPreference?
-        floatingButtonActionPref =  findPreference(getString(R.string.pref_key_floating_action)) as ListPreference?
+        floatingButtonActionPref =
+            findPreference(getString(R.string.pref_key_floating_action)) as ListPreference?
+        voiceInteractionActionPref =
+            findPreference(getString(R.string.pref_key_voice_interaction_action)) as ListPreference?
         darkThemePref = findPreference(getString(R.string.pref_key_dark_theme)) as ListPreference?
         fileNamePatternPref =
             findPreference(getString(R.string.pref_key_file_name_pattern)) as EditTextPreference?
-        fileNamePlaceholders = findPreference(getString(R.string.pref_static_field_key_file_name_placeholders)) as Preference?
+        fileNamePlaceholders =
+            findPreference(getString(R.string.pref_static_field_key_file_name_placeholders)) as Preference?
 
         pref?.registerOnSharedPreferenceChangeListener(prefListener)
 
@@ -159,9 +173,18 @@ class SettingFragment : PreferenceFragmentCompat() {
         makeNotificationSettingsLink()
         makeAccessibilitySettingsLink()
         makeStorageDirectoryLink()
+        makeAdvancedSettingsLink()
 
-        if (savedInstanceState?.getBoolean(FLOATING_BUTTON_SHOW_CLOSE_DIALOG_SHOWN, false) == true) {
-            updateFloatingButtonClose(savedInstanceState.getString(FLOATING_BUTTON_SHOW_CLOSE_DIALOG_VALUE))
+        if (savedInstanceState?.getBoolean(
+                FLOATING_BUTTON_SHOW_CLOSE_DIALOG_SHOWN,
+                false
+            ) == true
+        ) {
+            updateFloatingButtonClose(
+                savedInstanceState.getString(
+                    FLOATING_BUTTON_SHOW_CLOSE_DIALOG_VALUE
+                )
+            )
         }
     }
 
@@ -172,6 +195,7 @@ class SettingFragment : PreferenceFragmentCompat() {
         delayPref?.run { updateDelaySummary(value) }
         tileActionPref?.run { updateTileActionSummary(value) }
         floatingButtonActionPref?.run { updateFloatingActionSummary(value) }
+        voiceInteractionActionPref?.run { updateVoiceInteractionActionSummary(value) }
         fileFormatPref?.run { updateFileFormatSummary(value) }
         floatingButtonDelay?.run { updateFloatingButtonDelaySummary(value) }
         fileNamePatternPref?.run { updateFileNamePatternSummary() }
@@ -234,7 +258,7 @@ class SettingFragment : PreferenceFragmentCompat() {
              */
             val myActivity = activity
             myActivity?.apply {
-                if ((it as? SwitchPreference)?.isChecked == true && ScreenshotAccessibilityService.instance == null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && (it as? SwitchPreference)?.isChecked == true && ScreenshotAccessibilityService.instance == null) {
                     // Accessibility service is not running -> Open settings so user can enable it
                     openAccessibilitySettings(this, TAG)
                 }
@@ -270,15 +294,32 @@ class SettingFragment : PreferenceFragmentCompat() {
         }
     }
 
+    private fun makeAdvancedSettingsLink() {
+        val myPref =
+            findPreference(getString(R.string.pref_static_field_key_advanced_settings)) as Preference?
+
+        myPref?.isSelectable = true
+        myPref?.onPreferenceClickListener = OnPreferenceClickListener {
+            activity?.apply {
+                supportFragmentManager.commit {
+                    replace<SettingAdvancedFragment>(android.R.id.content)
+                    setReorderingAllowed(true)
+                    addToBackStack(null)
+                }
+            }
+            true
+        }
+    }
+
     private fun updateNotificationSummary() {
         activity?.let { myActivity ->
             notificationPref?.apply {
                 when {
-                    prefManager.useNative && ScreenshotAccessibilityService.instance != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.R -> {
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefManager.useNative && ScreenshotAccessibilityService.instance != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.R -> {
                         isEnabled = false
                         summary = getString(R.string.use_native_screenshot_option_default)
                     }
-                    prefManager.useNative && ScreenshotAccessibilityService.instance != null && prefManager.useSystemDefaults -> {
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefManager.useNative && ScreenshotAccessibilityService.instance != null && prefManager.useSystemDefaults -> {
                         isEnabled = false
                         summary = getString(R.string.use_native_screenshot_option_android11)
                     }
@@ -319,6 +360,38 @@ class SettingFragment : PreferenceFragmentCompat() {
         }
     }
 
+    private fun updateVoiceInteractionActionSummary(value: String) {
+        var newValue = value
+        if (value == getString(R.string.setting_voice_interaction_action_value_native)) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                // Not Supported below Android 9
+                newValue = getString(R.string.setting_voice_interaction_action_value_provided)
+                context.toastMessage(
+                    getString(R.string.use_native_screenshot_unsupported),
+                    ToastType.ERROR
+                )
+            } else if (ScreenshotAccessibilityService.instance == null) {
+                // Open Accessibility settings if service not running
+                this.activity?.run { openAccessibilitySettings(this, TAG) }
+            }
+        } else if (MyVoiceInteractionService.instance != null) {
+            this.activity?.run {
+                if (packageManager.checkPermission(
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                        packageName
+                    ) != PackageManager.PERMISSION_GRANTED
+                ) {
+                    App.requestStoragePermission(this, false)
+                }
+            }
+        }
+
+        prefManager.voiceInteractionAction = newValue
+        voiceInteractionActionPref?.apply {
+            summary = entries[findIndexOfValue(newValue)]
+        }
+    }
+
     private fun updateFileFormatSummary(value: String) {
         fileFormatPref?.apply {
             if (prefManager.useSystemDefaults && prefManager.useNative) {
@@ -396,11 +469,10 @@ class SettingFragment : PreferenceFragmentCompat() {
                 true
             } catch (e: Exception) {
                 Log.e(TAG, "setComponentEnabledSetting", e)
-                Toast.makeText(
-                    context,
+                context.toastMessage(
                     myActivity.getString(R.string.toggle_app_icon_failed),
-                    Toast.LENGTH_LONG
-                ).show()
+                    ToastType.ERROR
+                )
                 prefManager.hideApp = !hide
                 false
             }
@@ -533,7 +605,7 @@ class SettingFragment : PreferenceFragmentCompat() {
                     else -> false
                 }
             }
-            closeButtonEmojiInput.addTextChangedListener { v ->
+            closeButtonEmojiInput.addTextChangedListener {
                 floatingButtonShowCloseTextValue = closeButtonEmojiInput.text.toString()
                 if (closeButtonEmojiInput.text.isBlank()) {
                     (requireActivity().getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager?)?.hideSoftInputFromWindow(
@@ -583,10 +655,10 @@ class SettingFragment : PreferenceFragmentCompat() {
 
     private fun updateStorageDirectory() {
         storageDirectoryPref?.run {
-            if (prefManager.useNative && ScreenshotAccessibilityService.instance != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefManager.useNative && ScreenshotAccessibilityService.instance != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
                 summary = getString(R.string.use_native_screenshot_option_default)
                 isEnabled = false
-            } else if (prefManager.useNative && ScreenshotAccessibilityService.instance != null && prefManager.useSystemDefaults) {
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefManager.useNative && ScreenshotAccessibilityService.instance != null && prefManager.useSystemDefaults) {
                 summary = getString(R.string.use_native_screenshot_option_android11)
                 isEnabled = false
             } else if (prefManager.screenshotDirectory != null) {
@@ -631,7 +703,10 @@ class SettingFragment : PreferenceFragmentCompat() {
     override fun onSaveInstanceState(outState: Bundle) {
         if (floatingButtonShowCloseAlertDialog?.isShowing == true) {
             outState.putBoolean(FLOATING_BUTTON_SHOW_CLOSE_DIALOG_SHOWN, true)
-            outState.putString(FLOATING_BUTTON_SHOW_CLOSE_DIALOG_VALUE, floatingButtonShowCloseTextValue)
+            outState.putString(
+                FLOATING_BUTTON_SHOW_CLOSE_DIALOG_VALUE,
+                floatingButtonShowCloseTextValue
+            )
         }
         super.onSaveInstanceState(outState)
     }
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/partial/ScreenshotSelectorView.kt b/app/src/main/java/com/github/cvzi/screenshottile/partial/ScreenshotSelectorView.kt
index d7ce03eb3..a602cc277 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/partial/ScreenshotSelectorView.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/partial/ScreenshotSelectorView.kt
@@ -22,6 +22,7 @@ package com.github.cvzi.screenshottile.partial
 
 import android.content.Context
 import android.graphics.*
+import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
@@ -35,19 +36,38 @@ import kotlin.math.min
  * Draws a selection rectangle while taking screenshot
  */
 class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : View(context, attrs) {
+    companion object {
+        private const val OFF = 0
+        private const val LEFT = 1
+        private const val TOP = 2
+        private const val RIGHT = 4
+        private const val BOTTOM = 8
+    }
+
     var onShutter: ((Rect) -> Unit)? = null
     var shutter: Int? = null
+    var fullScreenIcon: Int? = null
     var text: String? = null
+    var bitmap: Bitmap? = null
 
+    var defaultState = true
     private var showShutter = false
     private var startPoint: Point? = null
     private var selectionRect: Rect? = null
     private var resultRect: Rect? = null
+    private var edgeMode = OFF
+    private var shutterRect: Rect? = null
+    private var fullscreenButtonRect: Rect? = null
+    private var drawablesCache = HashMap<Int, Drawable?>(2)
 
     private val paintSelection = Paint(Color.TRANSPARENT).apply {
         style = Paint.Style.FILL
         xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
     }
+    private val paintEdgeOutside = Paint(Color.RED).apply {
+        alpha = 160
+        style = Paint.Style.FILL
+    }
     private val paintBackground = Paint(Color.BLACK).apply {
         alpha = 160
         style = Paint.Style.FILL
@@ -61,21 +81,50 @@ class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : Vi
         xfermode = PorterDuffXfermode(PorterDuff.Mode.XOR)
     }
 
+    fun reset() {
+        defaultState = true
+        showShutter = false
+        startPoint = null
+        selectionRect = null
+        resultRect = null
+        edgeMode = OFF
+        shutterRect = null
+        fullscreenButtonRect = null
+        invalidate()
+    }
+
+    private fun getDrawable(resource: Int): Drawable? {
+        return drawablesCache.getOrPut(resource) {
+            ResourcesCompat.getDrawable(this.resources, resource, null)
+        }
+    }
+
     private fun startSelection(x: Int, y: Int) {
         startPoint = Point(x, y)
         selectionRect = Rect(x, y, x, y)
         showShutter = false
+        edgeMode = OFF
     }
 
     private fun updateSelection(x: Int, y: Int) {
-        selectionRect?.run {
-            startPoint?.let {
-                left = min(it.x, x)
-                right = max(it.x, x)
-                top = min(it.y, y)
-                bottom = max(it.y, y)
+        if (edgeMode != OFF) {
+            resultRect?.run {
+                left = if (edgeMode and LEFT > 0) x else left
+                top = if (edgeMode and TOP > 0) y else top
+                right = if (edgeMode and RIGHT > 0) x else right
+                bottom = if (edgeMode and BOTTOM > 0) y else bottom
                 invalidate()
             }
+        } else {
+            selectionRect?.run {
+                startPoint?.let {
+                    left = min(it.x, x)
+                    top = min(it.y, y)
+                    right = max(it.x, x)
+                    bottom = max(it.y, y)
+                    invalidate()
+                }
+            }
         }
     }
 
@@ -85,6 +134,15 @@ class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : Vi
         selectionRect = null
     }
 
+    private fun ignoreSelection() {
+        startPoint = null
+        selectionRect = null
+    }
+
+    private fun stopEdgeMode() {
+        edgeMode = OFF
+    }
+
     private fun showShutter() {
         if (shutter != null) {
             showShutter = true
@@ -97,61 +155,213 @@ class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : Vi
         invalidate()
     }
 
+    private fun isInEdge(rect: Rect, x: Int, y: Int): Int {
+        val sizeH = max(this@ScreenshotSelectorView.width / 20, 15)
+        val sizeV = max(this@ScreenshotSelectorView.height / 20, 15)
+
+        val leftEdge =
+            Rect(rect.left - sizeH, rect.top - sizeV, rect.left + sizeH, rect.bottom + sizeV)
+        val topEdge =
+            Rect(rect.left - sizeH, rect.top - sizeV, rect.right + sizeH, rect.top + sizeV)
+        val rightEdge =
+            Rect(rect.right - sizeH, rect.top - sizeV, rect.right + sizeH, rect.bottom + sizeV)
+        val bottomEdge =
+            Rect(rect.left - sizeH, rect.bottom - sizeV, rect.right + sizeH, rect.bottom + sizeV)
+
+        var edgeMode = OFF
+        if (leftEdge.contains(x, y)) {
+            edgeMode += LEFT
+        }
+        if (topEdge.contains(x, y)) {
+            edgeMode += TOP
+        }
+        if (rightEdge.contains(x, y)) {
+            edgeMode += RIGHT
+        }
+        if (bottomEdge.contains(x, y)) {
+            edgeMode += BOTTOM
+        }
+        return edgeMode
+    }
+
+    private fun drawEdges(canvas: Canvas, rect: Rect) {
+        val edgeSize = max(
+            (min(this@ScreenshotSelectorView.width, this@ScreenshotSelectorView.height) / 20) - 5,
+            10
+        )
+
+        val leftEdgeHalf =
+            Rect(rect.left - edgeSize, rect.top - edgeSize, rect.left, rect.bottom + edgeSize)
+        val topEdgeHalf =
+            Rect(rect.left - edgeSize, rect.top - edgeSize, rect.right + edgeSize, rect.top)
+        val rightEdgeHalf =
+            Rect(rect.right, rect.top - edgeSize, rect.right + edgeSize, rect.bottom + edgeSize)
+        val bottomEdgeHalf =
+            Rect(rect.left - edgeSize, rect.bottom, rect.right + edgeSize, rect.bottom + edgeSize)
+
+        canvas.drawRect(leftEdgeHalf, paintEdgeOutside)
+        canvas.drawRect(topEdgeHalf, paintEdgeOutside)
+        canvas.drawRect(rightEdgeHalf, paintEdgeOutside)
+        canvas.drawRect(bottomEdgeHalf, paintEdgeOutside)
+    }
+
+    private fun drawFullScreenButton(canvas: Canvas, rect: Rect) {
+        fullScreenIcon?.run {
+            // Show image on dark rounded rect
+            getDrawable(this)?.apply {
+                val m2 = min(intrinsicWidth, intrinsicHeight)
+                val m3 = max(min(min(rect.width(), rect.height()) / 5, m2), m2)
+
+                // Find a suitable position for the full screen icon
+                var centerX = rect.centerX()
+                var centerY = rect.centerY()
+                var showFullScreenIcon = true
+                when {
+                    rect.bottom + 10 * m2 < this@ScreenshotSelectorView.height -> {
+                        centerY = rect.bottom + 4 * m2
+                    }
+                    rect.top - 6 * m2 > 0 -> {
+                        centerY = rect.top - 4 * m2
+                    }
+                    rect.right + 10 * m2 < this@ScreenshotSelectorView.width -> {
+                        centerX = rect.right + 4 * m2
+                    }
+                    rect.left - 6 * m2 > 0 -> {
+                        centerX = rect.left - 4 * m2
+                    }
+                    else -> {
+                        showFullScreenIcon = false
+                    }
+                }
+
+                if (showFullScreenIcon) {
+                    setBounds(
+                        centerX - m2,
+                        centerY - m2,
+                        centerX + m2,
+                        centerY + m2
+                    )
+                    val fullScreenRoundRect = RectF(
+                        (centerX - m3).toFloat(),
+                        (centerY - m3).toFloat(),
+                        (centerX + m3).toFloat(),
+                        (centerY + m3).toFloat()
+                    )
+
+                    canvas.drawRoundRect(
+                        fullScreenRoundRect,
+                        20.0f,
+                        20.0f,
+                        paintBackground
+                    )
+
+                    fullscreenButtonRect = Rect().apply {
+                        fullScreenRoundRect.roundOut(this)
+                    }
+                    draw(canvas)
+                } else {
+                    fullscreenButtonRect = null
+                }
+            }
+        }
+    }
+
+    private fun drawButtons(canvas: Canvas, rect: Rect) {
+        shutter?.run {
+            // Show shutter image on dark rounded rect
+            getDrawable(this)?.apply {
+                if (rect.width() > intrinsicWidth || rect.height() > intrinsicHeight) {
+                    val m0 = min(intrinsicWidth / 2, intrinsicHeight / 2)
+                    setBounds(
+                        rect.centerX() - m0,
+                        rect.centerY() - m0,
+                        rect.centerX() + m0,
+                        rect.centerY() + m0
+                    )
+                    val m1 = min(
+                        min(rect.width(), rect.height()) / 5,
+                        min(intrinsicWidth, intrinsicHeight)
+                    )
+                    val roundRect = RectF(
+                        (rect.centerX() - m1).toFloat(),
+                        (rect.centerY() - m1).toFloat(),
+                        (rect.centerX() + m1).toFloat(),
+                        (rect.centerY() + m1).toFloat()
+                    )
+                    canvas.drawRoundRect(
+                        roundRect,
+                        20.0f,
+                        20.0f,
+                        paintBackground
+                    )
+                    shutterRect = Rect().apply {
+                        roundRect.roundOut(this)
+                    }
+
+                    drawFullScreenButton(canvas, rect)
+
+                } else {
+                    setBounds(rect.left, rect.top, rect.right, rect.bottom)
+                }
+                draw(canvas)
+            }
+        }
+
+        // Show text if no shutter image was set
+        if (shutter == null) {
+            val textBounds = Rect()
+            val mText = text ?: "Tap to save"
+            paintText.getTextBounds(mText, 0, mText.length, textBounds)
+            paintText.textSize = this@ScreenshotSelectorView.width / 20.0f
+            val x = rect.centerX().toFloat() - textBounds.centerX()
+            val y = rect.centerY().toFloat() - textBounds.centerY()
+            canvas.drawText(
+                mText,
+                x,
+                y,
+                paintText
+            )
+            shutterRect = Rect(
+                x.toInt(),
+                y.toInt(),
+                (x + textBounds.width()).toInt(),
+                (y + textBounds.height()).toInt()
+            )
+        }
+    }
+
+
     override fun draw(canvas: Canvas) {
         super.draw(canvas)
 
+        val bm = bitmap
+        if (bm != null && !bm.isRecycled) {
+            canvas.drawBitmap(bm, 0f, 0f, null)
+        }
+
         canvas.drawPaint(paintBackground)
         selectionRect?.let { rect ->
-            canvas.drawRect(rect, paintSelection)
+            if (bm != null && !bm.isRecycled) {
+                canvas.drawBitmap(bm, rect, rect, null)
+            } else {
+                canvas.drawRect(rect, paintSelection)
+            }
             return
         }
         resultRect?.let { rect ->
-            canvas.drawRect(rect, paintSelection)
+            if (bm != null && !bm.isRecycled) {
+                canvas.drawBitmap(bm, rect, rect, null)
+            } else {
+                canvas.drawRect(rect, paintSelection)
+            }
+
+            drawEdges(canvas, rect)
 
             if (showShutter) {
-                shutter?.run {
-                    // Show image on dark rounded rect
-                    ResourcesCompat.getDrawable(resources, this, null)?.apply {
-                        if (rect.width() > intrinsicWidth || rect.height() > intrinsicHeight) {
-                            val m0 = min(intrinsicWidth / 2, intrinsicHeight / 2)
-                            setBounds(
-                                rect.centerX() - m0,
-                                rect.centerY() - m0,
-                                rect.centerX() + m0,
-                                rect.centerY() + m0
-                            )
-                            val m1 = min(
-                                min(rect.width(), rect.height()) / 5,
-                                min(intrinsicWidth, intrinsicHeight)
-                            )
-                            canvas.drawRoundRect(
-                                (rect.centerX() - m1).toFloat(),
-                                (rect.centerY() - m1).toFloat(),
-                                (rect.centerX() + m1).toFloat(),
-                                (rect.centerY() + m1).toFloat(),
-                                20.0f,
-                                20.0f,
-                                paintBackground
-                            )
-                        } else {
-                            setBounds(rect.left, rect.top, rect.right, rect.bottom)
-                        }
-                        draw(canvas)
-                    }
-                }
-                if (shutter == null) {
-                    // Show text if no image was provided
-                    val textBounds = Rect()
-                    val mText = text ?: "Tap to save"
-                    paintText.getTextBounds(mText, 0, mText.length, textBounds)
-                    paintText.textSize = this@ScreenshotSelectorView.width / 20.0f
-                    canvas.drawText(
-                        mText,
-                        rect.centerX().toFloat() - textBounds.centerX(),
-                        rect.centerY().toFloat() - textBounds.centerY(),
-                        paintText
-                    )
-                }
+                drawButtons(canvas, rect)
+
+            } else {
+                shutterRect = null
             }
         }
     }
@@ -167,17 +377,51 @@ class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : Vi
         }
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
+                defaultState = false
                 val x = event.x.toInt()
                 val y = event.y.toInt()
-                resultRect?.run {
-                    if (width() != 0 && height() != 0 && contains(x, y)) {
-                        hideShutter()
-                        performClick()
-                        onShutter?.invoke(this)
-                        return true
+                if (resultRect != null) {
+                    resultRect?.run {
+                        if (width() != 0 && height() != 0) {
+                            if (shutterRect?.contains(x, y) == true) {
+                                // Click on shutter
+                                hideShutter()
+                                performClick()
+                                onShutter?.invoke(this)
+                                return false
+                            }
+                            if (fullscreenButtonRect?.contains(x, y) == true) {
+                                // Click on fullscreen button
+                                resultRect = Rect(
+                                    0,
+                                    0,
+                                    this@ScreenshotSelectorView.width,
+                                    this@ScreenshotSelectorView.height
+                                )
+                                this@ScreenshotSelectorView.invalidate()
+                                return false
+                            }
+
+                            edgeMode = isInEdge(this, x, y)
+
+                            if (edgeMode == OFF) {
+                                if (contains(x, y)) {
+                                    // Click inside result rect and not on edge, capture screenshot
+                                    hideShutter()
+                                    performClick()
+                                    onShutter?.invoke(this)
+                                    return false
+                                } else {
+                                    // Click outside result rect and not on edge, start new selection
+                                    startSelection(x, y)
+                                }
+                            }
+                            return true
+                        }
                     }
+                } else {
+                    startSelection(x, y)
                 }
-                startSelection(x, y)
                 return true
             }
             MotionEvent.ACTION_MOVE -> {
@@ -190,8 +434,15 @@ class ScreenshotSelectorView(context: Context, attrs: AttributeSet? = null) : Vi
                         showShutter()
                     }
                 }
-
-                stopSelection()
+                if (edgeMode == OFF) {
+                    if (event.x.toInt() == startPoint?.x && event.y.toInt() == startPoint?.y) {
+                        ignoreSelection()
+                    } else {
+                        stopSelection()
+                    }
+                } else {
+                    stopEdgeMode()
+                }
                 return true
             }
         }
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotAccessibilityService.kt b/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotAccessibilityService.kt
index 08112c5d2..5bdf48f3f 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotAccessibilityService.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotAccessibilityService.kt
@@ -24,7 +24,9 @@ import android.view.*
 import android.view.Display.DEFAULT_DISPLAY
 import android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY
 import android.view.accessibility.AccessibilityEvent
-import android.widget.*
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import com.github.cvzi.screenshottile.App
@@ -485,6 +487,7 @@ class ScreenshotAccessibilityService : AccessibilityService() {
                     showTemporaryHiddenFloatingButton()
                 }, 1000)
             }
+            aMessage(getWinContext())
         }
 
         if (askForStoragePermissionAfter) {
@@ -561,6 +564,8 @@ class ScreenshotAccessibilityService : AccessibilityService() {
             return
         }
 
+        aMessage(getWinContext())
+
         screenDensity = resources.configuration.densityDpi
 
         val result = saveImageResult as? SaveImageResultSuccess?
@@ -576,10 +581,7 @@ class ScreenshotAccessibilityService : AccessibilityService() {
                 if (result.dummyPath.isNotEmpty()) {
                     dummyPath = result.dummyPath
                 }
-                Toast.makeText(
-                    getWinContext(),
-                    getString(R.string.screenshot_file_saved, dummyPath), Toast.LENGTH_LONG
-                ).show()
+                getWinContext().toastMessage(getString(R.string.screenshot_file_saved, dummyPath), ToastType.SUCCESS)
 
                 createNotification(
                     this,
@@ -595,10 +597,7 @@ class ScreenshotAccessibilityService : AccessibilityService() {
                 val uri = Uri.fromFile(result.file)
                 val path = result.file.absolutePath
 
-                Toast.makeText(
-                    getWinContext(),
-                    getString(R.string.screenshot_file_saved, path), Toast.LENGTH_LONG
-                ).show()
+                getWinContext().toastMessage(getString(R.string.screenshot_file_saved, path), ToastType.SUCCESS)
 
                 createNotification(
                     this,
@@ -621,7 +620,7 @@ class ScreenshotAccessibilityService : AccessibilityService() {
         } else {
             ""
         }
-        Toast.makeText(getWinContext(), message, Toast.LENGTH_LONG).show()
+        getWinContext().toastMessage(message, ToastType.ERROR)
     }
 
     override fun onAccessibilityEvent(event: AccessibilityEvent) {
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotTileService.kt b/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotTileService.kt
index 485c89566..b580cfd8f 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotTileService.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/services/ScreenshotTileService.kt
@@ -103,7 +103,7 @@ class ScreenshotTileService : TileService(),
             // Open accessibility settings if service is not running
             App.checkAccessibilityServiceOnCollapse(false)
             Handler(Looper.getMainLooper()).postDelayed({
-                if (App.getInstance().prefManager.useNative && ScreenshotAccessibilityService.instance == null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && App.getInstance().prefManager.useNative && ScreenshotAccessibilityService.instance == null) {
                     ScreenshotAccessibilityService.openAccessibilitySettings(this)
                 }
             }, 5000)
@@ -112,7 +112,7 @@ class ScreenshotTileService : TileService(),
         // Here we can be sure that the notification panel has fully collapsed
         if (takeScreenshotOnStopListening) {
             takeScreenshotOnStopListening = false
-            if (App.getInstance().prefManager.useNative && ScreenshotAccessibilityService.instance != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && App.getInstance().prefManager.useNative && ScreenshotAccessibilityService.instance != null) {
                 // Except if the panel was pulled down completely, then we still need a delay. This
                 // only matters for native method because it's too fast.
                 Handler(Looper.getMainLooper()).postDelayed({
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/utils/DrawableListPreference.kt b/app/src/main/java/com/github/cvzi/screenshottile/utils/DrawableListPreference.kt
index bfc8e6d64..92bc3ea88 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/utils/DrawableListPreference.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/utils/DrawableListPreference.kt
@@ -4,7 +4,6 @@ import android.app.AlertDialog
 import android.content.Context
 import android.os.Parcelable
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.Window
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/utils/PrefManager.kt b/app/src/main/java/com/github/cvzi/screenshottile/utils/PrefManager.kt
index 2db0b8b17..ed0f0cd99 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/utils/PrefManager.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/utils/PrefManager.kt
@@ -125,10 +125,8 @@ class PrefManager(private val context: Context, private val pref: SharedPreferen
         }
         set(value) = pref.edit().putString(
             context.getString(R.string.pref_key_file_name_pattern),
-            if (value.isBlank()) {
+            value.ifBlank {
                 context.getString(R.string.setting_file_name_pattern_value_default)
-            } else {
-                value
             }
         ).apply()
 
@@ -152,6 +150,16 @@ class PrefManager(private val context: Context, private val pref: SharedPreferen
             value
         ).apply()
 
+    var returnIfVoiceInteractionServiceEnabled: String?
+        get() = pref.getString(
+            context.getString(R.string.pref_key_return_if_voice_interaction),
+            null
+        )
+        set(value) = pref.edit().putString(
+            context.getString(R.string.pref_key_return_if_voice_interaction),
+            value
+        ).apply()
+
     var floatingButtonHideAfter: Boolean
         get() = pref.getBoolean(
             context.getString(R.string.pref_key_floating_button_hide_after),
@@ -244,6 +252,16 @@ class PrefManager(private val context: Context, private val pref: SharedPreferen
             value
         ).apply()
 
+    var voiceInteractionAction: String
+        get() = pref.getString(
+            context.getString(R.string.pref_key_voice_interaction_action),
+            context.getString(R.string.setting_voice_interaction_action_value_provided)
+        ) ?: context.getString(R.string.setting_voice_interaction_action_value_provided)
+        set(value) = pref.edit().putString(
+            context.getString(R.string.pref_key_voice_interaction_action),
+            value
+        ).apply()
+
     var tileAction: String
         get() = pref.getString(
             context.getString(R.string.pref_key_tile_action),
@@ -263,4 +281,71 @@ class PrefManager(private val context: Context, private val pref: SharedPreferen
             context.getString(R.string.pref_key_dark_theme),
             value
         ).apply()
+
+    var toasts: Boolean
+        get() = pref.getBoolean(context.getString(R.string.pref_key_toasts), true)
+        set(value) = pref.edit().putBoolean(
+            context.getString(R.string.pref_key_toasts),
+            value
+        ).apply()
+
+    var naggingToasts: Boolean
+        get() = pref.getBoolean(context.getString(R.string.pref_key_nagging_toasts), true)
+        set(value) = pref.edit().putBoolean(
+            context.getString(R.string.pref_key_nagging_toasts),
+            value
+        ).apply()
+
+    var successToasts: Boolean
+        get() = pref.getBoolean(context.getString(R.string.pref_key_success_toasts), true)
+        set(value) = pref.edit().putBoolean(
+            context.getString(R.string.pref_key_success_toasts),
+            value
+        ).apply()
+
+    var errorToasts: Boolean
+        get() = pref.getBoolean(context.getString(R.string.pref_key_error_toasts), true)
+        set(value) = pref.edit().putBoolean(
+            context.getString(R.string.pref_key_error_toasts),
+            value
+        ).apply()
+
+    var selectAreaShutterDelay: Long
+        get() {
+            val d = pref.getString(
+                context.getString(R.string.pref_key_select_area_shutter_delay),
+                context.getString(R.string.pref_select_area_shutter_delay_default)
+            )?.toLongOrNull() ?: 0
+            return if (d >= 0) d else 0
+        }
+        set(value) = pref.edit().putString(
+            context.getString(R.string.pref_key_select_area_shutter_delay),
+            value.toString()
+        ).apply()
+
+    var originalAfterPermissionDelay: Long
+        get() {
+            val d = pref.getString(
+                context.getString(R.string.pref_key_original_after_permission_delay),
+                context.getString(R.string.pref_original_after_permission_delay_default)
+            )?.toLongOrNull() ?: 300
+            return if (d >= 0) d else 0
+        }
+        set(value) = pref.edit().putString(
+            context.getString(R.string.pref_key_original_after_permission_delay),
+            value.toString()
+        ).apply()
+
+    var failedVirtualDisplayDelay: Long
+        get() {
+            val d = pref.getString(
+                context.getString(R.string.pref_key_failed_virtual_display_delay),
+                context.getString(R.string.pref_failed_virtual_display_delay_default)
+            )?.toLongOrNull() ?: 0
+            return if (d >= 0) d else 0
+        }
+        set(value) = pref.edit().putString(
+            context.getString(R.string.pref_key_failed_virtual_display_delay),
+            value.toString()
+        ).apply()
 }
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/utils/ShutterCollection.kt b/app/src/main/java/com/github/cvzi/screenshottile/utils/ShutterCollection.kt
index 5af297694..970875c7a 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/utils/ShutterCollection.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/utils/ShutterCollection.kt
@@ -7,7 +7,6 @@ package com.github.cvzi.screenshottile.utils
 import android.annotation.SuppressLint
 import android.content.Context
 import androidx.annotation.ArrayRes
-import androidx.annotation.DrawableRes
 import com.github.cvzi.screenshottile.App
 
 /**
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/utils/Utils.kt b/app/src/main/java/com/github/cvzi/screenshottile/utils/Utils.kt
index d8d962aef..8ca54b697 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/utils/Utils.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/utils/Utils.kt
@@ -11,10 +11,8 @@ import android.graphics.Rect
 import android.icu.text.SimpleDateFormat
 import android.media.Image
 import android.net.Uri
-import android.os.Build
-import android.os.Environment
+import android.os.*
 import android.os.Environment.getExternalStoragePublicDirectory
-import android.os.StatFs
 import android.provider.MediaStore.Images
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
@@ -24,6 +22,7 @@ import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.widget.TextView
+import android.widget.Toast
 import androidx.documentfile.provider.DocumentFile
 import com.github.cvzi.screenshottile.App
 import com.github.cvzi.screenshottile.BuildConfig
@@ -412,11 +411,23 @@ fun formatFileName(fileNamePattern: String, date: Date): String {
  */
 fun saveBitmapToFile(
     context: Context,
-    bitmap: Bitmap,
+    fullBitmap: Bitmap,
     fileNamePattern: String,
     compressionOptions: CompressionOptions = CompressionOptions(),
     cutOutRect: Rect?
 ): SaveImageResult {
+    val bitmap = if (cutOutRect != null) {
+        Bitmap.createBitmap(
+            fullBitmap,
+            cutOutRect.left,
+            cutOutRect.top,
+            cutOutRect.width(),
+            cutOutRect.height()
+        )
+    } else {
+        fullBitmap
+    }
+
     val date = Date()
 
     val filename = formatFileName(fileNamePattern, date)
@@ -447,6 +458,7 @@ fun saveBitmapToFile(
     }
 
     val bytes = ByteArrayOutputStream()
+
     bitmap.compress(compressionOptions.format, compressionOptions.quality, bytes)
 
     var success = false
@@ -559,7 +571,7 @@ fun saveImageToFile(
     val bitmap = imageToBitmap(image, cutOutRect)
     image.close()
 
-    return saveBitmapToFile(context, bitmap, fileNamePattern, compressionOptions, cutOutRect)
+    return saveBitmapToFile(context, bitmap, fileNamePattern, compressionOptions, null)
 }
 
 
@@ -727,3 +739,61 @@ fun hasFdroid(context: Context): Boolean {
     }
     return false
 }
+
+enum class ToastType {
+    SUCCESS, ERROR, NAGGING
+}
+
+/**
+ * Show a string as a Toast message
+ */
+fun Context?.toastMessage(text: String, toastType: ToastType, duration: Int = Toast.LENGTH_LONG) {
+    this?.run {
+        val prefManager = App.getInstance().prefManager
+        val showToast = prefManager.toasts && when (toastType) {
+            ToastType.SUCCESS -> prefManager.successToasts
+            ToastType.ERROR -> prefManager.errorToasts
+            ToastType.NAGGING -> prefManager.naggingToasts
+        }
+        if (showToast) {
+            Toast.makeText(this, text, duration).show()
+        } else if (BuildConfig.DEBUG) {
+            Log.v("SUPPRESSED_TOAST", text)
+        }
+    }
+}
+
+/**
+ * Show a string from a resource as a Toast message
+ */
+fun Context?.toastMessage(resource: Int, toastType: ToastType, duration: Int = Toast.LENGTH_LONG) {
+    this?.toastMessage(getString(resource), toastType, duration)
+}
+
+/**
+ * A message
+ */
+fun aMessage(context: Context) {
+    if (Locale.getDefault().country != "RU" ||
+        hasFdroid(context) ||
+        !App.getInstance().prefManager.naggingToasts ||
+        App.getInstance().prefManager.screenshotCount % 3 != 0
+    ) {
+        return
+    }
+    val m0 =
+        "\ud83c\uddf7\ud83c\uddfa \u0420\u043e\u0441\u0441\u0438\u044f\u043d\u0435\u003a \u0412\u0430\u0448\u0435 \u043f\u0440\u0430\u0432\u0438\u0442\u0435\u043b\u044c\u0441\u0442\u0432\u043e \u043b\u0436\u0435\u0442 \u0432\u0430\u043c \u043e\u0431 \u0423\u043a\u0440\u0430\u0438\u043d\u0435 \ud83c\uddfa\ud83c\udde6"
+    val m1 =
+        "\u0423\u0431\u0438\u0432\u0430\u044e\u0442 \u043d\u0435\u0432\u0438\u043d\u043d\u044b\u0445 \u043b\u044e\u0434\u0435\u0439 \u0438 \u0434\u0435\u0442\u0435\u0439"
+    val m2 =
+        "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430\u002c \u043d\u0430\u0439\u0434\u0438\u0442\u0435 \u0441\u043f\u043e\u0441\u043e\u0431 \u0443\u0437\u043d\u0430\u0442\u044c \u043f\u0440\u0430\u0432\u0434\u0443"
+    Handler(Looper.getMainLooper()).postDelayed({
+        context.toastMessage(m0, ToastType.NAGGING)
+    }, 4000)
+    Handler(Looper.getMainLooper()).postDelayed({
+        context.toastMessage(m1, ToastType.NAGGING)
+    }, 8000)
+    Handler(Looper.getMainLooper()).postDelayed({
+        context.toastMessage(m2, ToastType.NAGGING)
+    }, 12000)
+}
diff --git a/app/src/main/java/com/github/cvzi/screenshottile/utils/UtilsImage.kt b/app/src/main/java/com/github/cvzi/screenshottile/utils/UtilsImage.kt
index 0dbe087b2..060df463e 100644
--- a/app/src/main/java/com/github/cvzi/screenshottile/utils/UtilsImage.kt
+++ b/app/src/main/java/com/github/cvzi/screenshottile/utils/UtilsImage.kt
@@ -3,9 +3,7 @@ package com.github.cvzi.screenshottile.utils
 import android.content.ContentUris
 import android.content.ContentValues
 import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Point
-import android.graphics.Rect
+import android.graphics.*
 import android.media.Image
 import android.net.Uri
 import android.os.Build
@@ -324,3 +322,14 @@ fun realScreenSize(context: Context): Point {
         }
     }
 }
+
+/**
+ * Tint image (for debugging)
+ */
+fun tintImage(bitmap: Bitmap, color: Long): Bitmap? {
+    val newBitmap = Bitmap.createBitmap(bitmap.width, bitmap.height, Bitmap.Config.ARGB_8888)
+    Canvas(newBitmap).drawBitmap(bitmap, 0f, 0f, Paint().apply {
+        colorFilter = PorterDuffColorFilter(color.toInt(), PorterDuff.Mode.ADD)
+    })
+    return newBitmap
+}
diff --git a/app/src/main/res/drawable-anydpi/ic_fullscreen.xml b/app/src/main/res/drawable-anydpi/ic_fullscreen.xml
new file mode 100644
index 000000000..f53eec354
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_fullscreen.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <group android:scaleX="1.3333334"
+      android:scaleY="1.3333334"
+      android:translateX="-4"
+      android:translateY="-4">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_fullscreen.png b/app/src/main/res/drawable-hdpi/ic_fullscreen.png
new file mode 100644
index 000000000..fc62195e0
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_fullscreen.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fullscreen.png b/app/src/main/res/drawable-mdpi/ic_fullscreen.png
new file mode 100644
index 000000000..ce63f2c12
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_fullscreen.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fullscreen.png b/app/src/main/res/drawable-xhdpi/ic_fullscreen.png
new file mode 100644
index 000000000..f0ddec79f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_fullscreen.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fullscreen.png b/app/src/main/res/drawable-xxhdpi/ic_fullscreen.png
new file mode 100644
index 000000000..e88060dfe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_fullscreen.png differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 44a550b0a..7534e7098 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -190,6 +190,46 @@
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
+            <androidx.cardview.widget.CardView style="@style/CardViewSecondary">
+
+                <LinearLayout
+                    android:id="@+id/linearLayoutAssist"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="10dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <com.google.android.material.switchmaterial.SwitchMaterial
+                            android:id="@+id/switchAssist"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:contentDescription="@string/main_assist_app_title" />
+
+                        <TextView
+                            android:id="@+id/textTitleAssist"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:text="@string/main_assist_app_title"
+                            android:textAppearance="@android:style/TextAppearance.Material.Title" />
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/textDescAssist"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/main_assist_app_text"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
             <androidx.cardview.widget.CardView style="@style/CardViewPrimary">
 
                 <LinearLayout
diff --git a/app/src/main/res/layout/image_crop.xml b/app/src/main/res/layout/image_crop.xml
new file mode 100644
index 000000000..117bef860
--- /dev/null
+++ b/app/src/main/res/layout/image_crop.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.github.cvzi.screenshottile.partial.ScreenshotSelectorView
+        android:id="@+id/global_screenshot_selector"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:pointerIcon="crosshair" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_advanced.xml b/app/src/main/res/values/strings_advanced.xml
new file mode 100644
index 000000000..f1b753888
--- /dev/null
+++ b/app/src/main/res/values/strings_advanced.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pref_static_field_key_advanced_settings" translatable="false">pref_static_field_key_advanced_settings</string>
+    <string name="advanced_settings" translatable="false">Advanced settings</string>
+
+    <string name="pref_key_toasts" translatable="false">pref_key_toasts</string>
+    <bool name="pref_toasts_default">true</bool>
+    <string name="setting_toasts" translatable="false">Toast notifications</string>
+    <string name="setting_toasts_summary" translatable="false">Enable/Disable all toast notifications\nDefault: On</string>
+
+    <string name="pref_key_success_toasts" translatable="false">pref_key_success_toasts</string>
+    <bool name="pref_success_toasts_default">true</bool>
+    <string name="setting_success_toasts" translatable="false">Toast notifications for success</string>
+    <string name="setting_success_toasts_summary" translatable="false">Enable/Disable toast notifications for successful events\nDefault: On</string>
+
+    <string name="pref_key_error_toasts" translatable="false">pref_key_error_toasts</string>
+    <bool name="pref_error_toasts_default">true</bool>
+    <string name="setting_error_toasts" translatable="false">Toast notifications for errors</string>
+    <string name="setting_error_toasts_summary" translatable="false">Enable/Disable toast notifications for errors\nDefault: On</string>
+
+    <string name="pref_key_nagging_toasts" translatable="false">pref_key_nagging_toasts</string>
+    <bool name="pref_nagging_toasts_default">true</bool>
+    <string name="setting_nagging_toasts" translatable="false">&#x1f1fa;&#x1f1e6; Nagging toasts</string>
+    <string name="setting_nagging_toasts_summary" translatable="false">Nagging toast notifications\nDefault: On</string>
+
+    <string name="pref_key_select_area_shutter_delay" translatable="false">select_area_shutter_delay</string>
+    <string name="pref_select_area_shutter_delay_default" translatable="false">0</string>
+    <string name="setting_select_area_shutter_delay" translatable="false">Select area: Delay after shutter tap</string>
+    <string name="setting_select_area_shutter_delay_summary" translatable="false">Default: 0 (milliseconds)</string>
+    <string name="setting_select_area_shutter_delay_dialog" translatable="false">Waiting period between the time the shutter was tapped and the screenshot is taken. Use a higher value (e.g. 500 = half a second) if the shutter icon was visible on screenshots.\nDefault: 0 Unit: milliseconds</string>
+
+    <string name="pref_key_original_after_permission_delay" translatable="false">original_after_permission_delay</string>
+    <string name="pref_original_after_permission_delay_default" translatable="false">300</string>
+    <string name="setting_original_after_permission_delay" translatable="false">Original method: delay after screenshot permission was granted</string>
+    <string name="setting_original_after_permission_delay_summary" translatable="false">Default: 300 (milliseconds)</string>
+    <string name="setting_original_after_permission_delay_dialog" translatable="false">Waiting period between the time the permission was granted and the screenshot is taken. Use a higher value (e.g. 500 = half a second) if permission dialog was visible on screenshots.\nDefault: 300 Unit: milliseconds</string>
+
+    <string name="pref_key_failed_virtual_display_delay" translatable="false">failed_virtual_display_delay</string>
+    <string name="pref_failed_virtual_display_delay_default" translatable="false">0</string>
+    <string name="setting_failed_virtual_display_delay" translatable="false">Original method: delay after \'Failed to start virtual display\'</string>
+    <string name="setting_failed_virtual_display_delay_summary" translatable="false">Default: 0 (milliseconds)</string>
+    <string name="setting_failed_virtual_display_delay_dialog" translatable="false">Waiting period before trying again after the error \'Failed to start virtual display\'. Use a higher value (e.g. 500 = half a second) if the error message was visible on screenshots.\nDefault: 0 Unit: milliseconds</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml
index afd61c5ad..04445a211 100644
--- a/app/src/main/res/values/strings_untranslatable.xml
+++ b/app/src/main/res/values/strings_untranslatable.xml
@@ -35,6 +35,7 @@
     <string name="pref_key_floating_button_shutter" translatable="false">floating_button_shutter</string>
     <string name="pref_key_floating_button_delay" translatable="false">floating_button_delay</string>
     <string name="pref_key_return_if_accessibility" translatable="false">return_if_accessibility</string>
+    <string name="pref_key_return_if_voice_interaction" translatable="false">return_if_voice_interaction</string>
     <string name="setting_broadcast_secret_value_default" translatable="false">(unset)</string>
     <string name="setting_storage_directory_value_default" translatable="false">(default)</string>
     <string name="setting_file_name_pattern_value_default" translatable="false" formatted="false">Screenshot_%timestamp%</string>
@@ -130,6 +131,21 @@
         <item>@string/partial_screenshot</item>
     </string-array>
 
+    <string name="setting_voice_interaction_action_value_provided" translatable="false">provided</string>
+    <string name="setting_voice_interaction_action_value_native" translatable="false">native</string>
+    <string name="setting_voice_interaction_action_value_partial" translatable="false">partial</string>
+    <string-array name="setting_voice_interaction_action_values" translatable="false">
+        <item>@string/setting_voice_interaction_action_value_provided</item>
+        <item>@string/setting_voice_interaction_action_value_native</item>
+        <item>@string/setting_voice_interaction_action_value_partial</item>
+    </string-array>
+    <string name="pref_key_voice_interaction_action" translatable="false">voice_interaction_action</string>
+    <string-array name="setting_voice_interaction_action_entries" translatable="false">
+        <item>@string/take_screenshot</item>
+        <item>@string/use_native_screenshot</item>
+        <item>@string/partial_screenshot</item>
+    </string-array>
+
     <string name="setting_dark_theme_value_default" translatable="false">-1</string>
     <string name="setting_dark_theme_value_on" translatable="false">2</string>
     <string name="setting_dark_theme_value_off" translatable="false">1</string>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index 1b0854f7d..98fb3ecb6 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<full-backup-content />
+<data-extraction-rules>
+    <cloud-backup disableIfNoEncryptionCapabilities="false"/>
+    <device-transfer disableIfNoEncryptionCapabilities="false" />
+</data-extraction-rules>
diff --git a/app/src/main/res/xml/backup_rules_old.xml b/app/src/main/res/xml/backup_rules_old.xml
new file mode 100644
index 000000000..1b0854f7d
--- /dev/null
+++ b/app/src/main/res/xml/backup_rules_old.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content />
diff --git a/app/src/main/res/xml/interaction_service.xml b/app/src/main/res/xml/interaction_service.xml
new file mode 100644
index 000000000..3528ec973
--- /dev/null
+++ b/app/src/main/res/xml/interaction_service.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:sessionService="com.github.cvzi.screenshottile.assist.MyVoiceInteractionSessionService"
+    android:recognitionService="com.github.cvzi.screenshottile.assist.MyVoiceInteractionService"
+    android:settingsActivity="com.github.cvzi.screenshottile.activities.SettingsActivity"
+    android:supportsAssist="true" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref.xml b/app/src/main/res/xml/pref.xml
index a15c0983b..d3c049287 100644
--- a/app/src/main/res/xml/pref.xml
+++ b/app/src/main/res/xml/pref.xml
@@ -101,6 +101,15 @@
         android:title="@string/setting_floating_action"
         app:iconSpaceReserved="false" />
 
+    <androidx.preference.ListPreference
+        android:defaultValue="@string/setting_voice_interaction_action_value_provided"
+        android:entries="@array/setting_voice_interaction_action_entries"
+        android:entryValues="@array/setting_voice_interaction_action_values"
+        android:key="@string/pref_key_voice_interaction_action"
+        android:summary="@string/take_screenshot"
+        android:title="@string/setting_voice_interaction_action"
+        app:iconSpaceReserved="false" />
+
     <androidx.preference.EditTextPreference
         android:defaultValue="@string/setting_broadcast_secret_value_default"
         android:inputType="textVisiblePassword"
@@ -205,4 +214,12 @@
         android:summary="@string/about_privacy_summary"
         android:title="@string/about_privacy_title"
         app:iconSpaceReserved="false" />
+
+    <androidx.preference.Preference
+        android:key="@string/pref_static_field_key_advanced_settings"
+        android:persistent="false"
+        android:selectable="true"
+        android:title="@string/advanced_settings"
+        app:icon="@android:drawable/ic_menu_manage" />
+
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
new file mode 100644
index 000000000..24e4660af
--- /dev/null
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.preference.SwitchPreference
+        android:defaultValue="@bool/pref_toasts_default"
+        android:key="@string/pref_key_toasts"
+        android:summary="@string/setting_toasts_summary"
+        android:title="@string/setting_toasts"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.SwitchPreference
+        android:defaultValue="@bool/pref_success_toasts_default"
+        android:key="@string/pref_key_success_toasts"
+        android:summary="@string/setting_success_toasts_summary"
+        android:title="@string/setting_success_toasts"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.SwitchPreference
+        android:defaultValue="@bool/pref_error_toasts_default"
+        android:key="@string/pref_key_error_toasts"
+        android:summary="@string/setting_error_toasts_summary"
+        android:title="@string/setting_error_toasts"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.SwitchPreference
+        android:defaultValue="@bool/pref_nagging_toasts_default"
+        android:key="@string/pref_key_nagging_toasts"
+        android:summary="@string/setting_nagging_toasts_summary"
+        android:title="@string/setting_nagging_toasts"
+        app:iconSpaceReserved="false"
+        app:isPreferenceVisible="false" />
+
+    <androidx.preference.EditTextPreference
+        android:defaultValue="@string/pref_select_area_shutter_delay_default"
+        android:dialogMessage="@string/setting_select_area_shutter_delay_dialog"
+        android:key="@string/pref_key_select_area_shutter_delay"
+        android:summary="@string/setting_select_area_shutter_delay_summary"
+        android:title="@string/setting_select_area_shutter_delay"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.EditTextPreference
+        android:defaultValue="@string/pref_original_after_permission_delay_default"
+        android:dialogMessage="@string/setting_original_after_permission_delay_dialog"
+        android:key="@string/pref_key_original_after_permission_delay"
+        android:summary="@string/setting_original_after_permission_delay_summary"
+        android:title="@string/setting_original_after_permission_delay"
+        app:iconSpaceReserved="false" />
+
+    <androidx.preference.EditTextPreference
+        android:defaultValue="@string/pref_failed_virtual_display_delay_default"
+        android:dialogMessage="@string/setting_failed_virtual_display_delay_dialog"
+        android:key="@string/pref_key_failed_virtual_display_delay"
+        android:summary="@string/setting_failed_virtual_display_delay_summary"
+        android:title="@string/setting_failed_virtual_display_delay"
+        app:iconSpaceReserved="false" />
+
+</androidx.preference.PreferenceScreen>