From 51abc136a1eec892392750ce607c66c46c0db2ba Mon Sep 17 00:00:00 2001
From: Ashutosh Gangwar <ashutoshgngwr@gmail.com>
Date: Mon, 6 Sep 2021 21:10:31 +0530
Subject: [PATCH] feat(app): add option to disable media buttons

remove option to enable skipping unsaved presets

resolves #792
---
 .../ashutoshgngwr/noice/MediaPlayerService.kt |  2 +-
 .../noice/playback/PlayerManager.kt           | 35 +++++++++++++++----
 .../noice/repository/SettingsRepository.kt    |  6 ++--
 .../drawable/ic_settings_media_buttons.xml    | 10 ++++++
 .../ic_settings_skip_unsaved_presets.xml      | 10 ------
 app/src/main/res/values-ar/strings.xml        |  2 --
 app/src/main/res/values-el/strings.xml        |  2 --
 app/src/main/res/values-es-rES/strings.xml    |  1 -
 app/src/main/res/values-fa/strings.xml        |  2 --
 app/src/main/res/values-fi/strings.xml        |  2 --
 app/src/main/res/values-fr-rFR/strings.xml    |  2 --
 app/src/main/res/values-hi/strings.xml        |  2 --
 app/src/main/res/values-in/strings.xml        |  1 -
 app/src/main/res/values-it-rIT/strings.xml    |  2 --
 app/src/main/res/values-ja/strings.xml        |  2 --
 app/src/main/res/values-lt/strings.xml        |  2 --
 app/src/main/res/values-pt-rBR/strings.xml    |  2 --
 app/src/main/res/values-pt/strings.xml        |  2 --
 app/src/main/res/values-ru/strings.xml        |  2 --
 app/src/main/res/values-tr/strings.xml        |  2 --
 app/src/main/res/values-uk-rUA/strings.xml    |  2 --
 app/src/main/res/values-vi/strings.xml        |  2 --
 app/src/main/res/values/donottranslate.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/xml/settings.xml             |  8 ++---
 25 files changed, 50 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_settings_media_buttons.xml
 delete mode 100644 app/src/main/res/drawable/ic_settings_skip_unsaved_presets.xml

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt
index 19946300f..3a53709f9 100644
--- a/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt
+++ b/app/src/main/java/com/github/ashutoshgngwr/noice/MediaPlayerService.kt
@@ -116,7 +116,7 @@ class MediaPlayerService : Service() {
         FOREGROUND_ID,
         PlayerNotificationManager.createNotification(
           this, mediaSession, title,
-          currentPreset != null || settingsRepository.shouldAllowSkippingUnsavedPresets()
+          currentPreset != null
         )
       )
     }
diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/playback/PlayerManager.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/playback/PlayerManager.kt
index 631c4a3cc..851c0921b 100644
--- a/app/src/main/java/com/github/ashutoshgngwr/noice/playback/PlayerManager.kt
+++ b/app/src/main/java/com/github/ashutoshgngwr/noice/playback/PlayerManager.kt
@@ -95,11 +95,35 @@ class PlayerManager(private val context: Context, private val mediaSession: Medi
   init {
     setAudioUsage(AudioAttributesCompat.USAGE_MEDIA)
     mediaSession.setCallback(object : MediaSessionCompat.Callback() {
-      override fun onPlay() = resume()
-      override fun onStop() = stop()
-      override fun onPause() = pause()
-      override fun onSkipToPrevious() = skipPreset(SKIP_DIRECTION_PREV)
-      override fun onSkipToNext() = skipPreset(SKIP_DIRECTION_NEXT)
+      override fun onPlay() {
+        if (settingsRepository.isMediaButtonsEnabled()) {
+          resume()
+        }
+      }
+
+      override fun onStop() {
+        if (settingsRepository.isMediaButtonsEnabled()) {
+          stop()
+        }
+      }
+
+      override fun onPause() {
+        if (settingsRepository.isMediaButtonsEnabled()) {
+          pause()
+        }
+      }
+
+      override fun onSkipToPrevious() {
+        if (settingsRepository.isMediaButtonsEnabled()) {
+          skipPreset(SKIP_DIRECTION_PREV)
+        }
+      }
+
+      override fun onSkipToNext() {
+        if (settingsRepository.isMediaButtonsEnabled()) {
+          skipPreset(SKIP_DIRECTION_NEXT)
+        }
+      }
     })
   }
 
@@ -435,7 +459,6 @@ class PlayerManager(private val context: Context, private val mediaSession: Medi
     val presets = presetRepository.list()
     val currentPos = presets.indexOf(Preset.from("", players.values))
     if (currentPos < 0) {
-      playRandomPreset()
       return
     }
 
diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/repository/SettingsRepository.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/repository/SettingsRepository.kt
index ae72c5cc0..d9367200c 100644
--- a/app/src/main/java/com/github/ashutoshgngwr/noice/repository/SettingsRepository.kt
+++ b/app/src/main/java/com/github/ashutoshgngwr/noice/repository/SettingsRepository.kt
@@ -103,11 +103,11 @@ class SettingsRepository private constructor(private val context: Context) {
   }
 
   /**
-   * Returns the value of switch preference with key [R.string.should_allow_skipping_unsaved_presets_key]
+   * Returns the value of switch preference with key [R.string.enable_media_buttons_key]
    */
-  fun shouldAllowSkippingUnsavedPresets(): Boolean {
+  fun isMediaButtonsEnabled(): Boolean {
     return prefs.getBoolean(
-      context.getString(R.string.should_allow_skipping_unsaved_presets_key), true
+      context.getString(R.string.enable_media_buttons_key), true
     )
   }
 }
diff --git a/app/src/main/res/drawable/ic_settings_media_buttons.xml b/app/src/main/res/drawable/ic_settings_media_buttons.xml
new file mode 100644
index 000000000..21a95f80a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_media_buttons.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="32dp"
+  android:height="32dp"
+  android:tint="?attr/colorControlNormal"
+  android:viewportWidth="48"
+  android:viewportHeight="48">
+  <path
+    android:fillColor="#000000"
+    android:pathData="M30 19h4V5h-4zm8-14v14h4V5zM6.5 5v14l11-7zM6 30h2v12H6zm3.5 6l8.5 6V30zM30 42l8.5-6-8.5-6zm10-12v12h2V30z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_skip_unsaved_presets.xml b/app/src/main/res/drawable/ic_settings_skip_unsaved_presets.xml
deleted file mode 100644
index 844068523..000000000
--- a/app/src/main/res/drawable/ic_settings_skip_unsaved_presets.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="32dp"
-  android:height="32dp"
-  android:tint="?attr/colorControlNormal"
-  android:viewportWidth="24"
-  android:viewportHeight="24">
-  <path
-    android:fillColor="#ff000000"
-    android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20 17.96 7.46 20 9.5V4h-5.5zm0.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04 2.04-3.13-3.13z" />
-</vector>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 42de0485b..d20a964a5 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -107,8 +107,6 @@
     <string name="payment_pending">سنعلمك بمجرد الانتهاء من معالجة الدفع.</string>
     <string name="failed_to_purchase">فشل بدء تدفق الدفع. الرجاء معاودة المحاولة في وقت لاحق!</string>
     <string name="failed_to_load_inapp_purchases">فشل تحميل تفاصيل الشراء داخل التطبيق. الرجاء المحاولة مرة أخرى لاحقا!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">عند تشغيل الإعدادات المسبقة غير المحفوظة ، قم بتمكين أزرار التخطي في إشعار المشغل لإنشاء إعدادات مسبقة عشوائية</string>
-    <string name="should_allow_skipping_unsaved_presets">السماح بتخطي الإعدادات المسبقة غير المحفوظة</string>
     <string name="should_share_usage_data_summary">مشاركة بيانات الاستخدام والسلوك تلقائيا مع المطورين</string>
     <string name="should_share_usage_data">مشاركة بيانات الاستخدام والسلوك</string>
     <string name="others">الاخرين</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 2f9dd1d41..aedffb1c5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -173,8 +173,6 @@
     <string name="add_to_app_shortcuts">Προσθήκη στις συντομεύσεις εφαρμογής</string>
     <string name="app_authors">Εμφάνιση των συντελεστών του Noice</string>
     <string name="should_display_sound_icons">Εμφάνιση εικονιδίων ήχων</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Κατά την αναπαραγωγή μη αποθηκευμένων συνθέσεων, να επιτρέπεται η δημιουργία τυχαίων συνθέσεων, με το πάτημα του κουμπιού για το επόμενο κομμάτι στην ειδοποίηση της εφαρμογής</string>
-    <string name="should_allow_skipping_unsaved_presets">Να επιτρέπεται η παράκαμψη μη αποθηκευμένων συνθέσεων</string>
     <string name="should_share_usage_data_summary">Αυτόματη αποστολή δεδομένων χρήσης και συμπεριφοράς στον προγραμματιστή</string>
     <string name="should_share_usage_data">Αποστολή δεδομένων χρήσης και συμπεριφοράς</string>
     <string name="others">Αλλά</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 02d390e77..5234ab123 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -188,7 +188,6 @@
     <string name="failed_to_read_file">No se pudo leer el archivo seleccionado!</string>
     <string name="failed_to_purchase">No se ha podido iniciar el flujo de pagos. Vuelve a intentarlo más tarde!</string>
     <string name="failed_to_load_inapp_purchases">No se han podido cargar los detalles de la compra en la aplicación. Vuelve a intentarlo más tarde!</string>
-    <string name="should_allow_skipping_unsaved_presets">Omitir preajustes no guardados</string>
     <string name="should_share_usage_data_summary">Compartir automáticamente los datos de uso con los desarrolladores</string>
     <string name="should_share_usage_data">Compartir datos de uso</string>
     <string name="others">Otros</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 53b8582e5..fecaa536d 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -173,7 +173,6 @@
     <string name="import_presets_summary">وارد کردن گزینش‌های ذخیره شده از یک فایل خارج از برنامه موجب حذف تمام گزینش‌های موجود می‌شود</string>
     <string name="import_presets">وارد کردن از فایل</string>
     <string name="export_presets_summary">صادر کردن حالت فعلی گزینش‌های ذخیره شده به یک فایل خارج از برنامه</string>
-    <string name="should_allow_skipping_unsaved_presets">اجازه‌ی پرش از گزینش‌های ذخیره نشده</string>
     <string name="should_share_usage_data_summary">اشتراک‌گذاری خودکار داده‌های استفاده و رفتار، با برنامه‌نویسان</string>
     <string name="should_share_usage_data">اشتراک‌گذاری داده‌های استفاده و رفتار</string>
     <string name="others">دیگران</string>
@@ -189,5 +188,4 @@
     <string name="payment_pending">ما به محض پایان پردازش پرداخت شما، به شما خبر می‌دهیم.</string>
     <string name="failed_to_purchase">نتوانست روند پرداخت را آغاز کند. لطفاً بعداً دوباره تلاش کنید!</string>
     <string name="failed_to_load_inapp_purchases">نتوانست جزئیات خرید درون‌برنامه‌ای را بارگذاری کند. لطفاً بعداً دوباره تلاش کنید!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">فعال بودن دکمه‌های پرش در اعلان پخش برای ایجاد گزینش‌های تصادفی، در زمان پخش گزینش‌های ذخیره نشده</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index dc8703468..4c77e8012 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -140,8 +140,6 @@
     <string name="payment_pending">Ilmoitamme sinulle heti, kun olemme käsitelleet maksusi.</string>
     <string name="failed_to_purchase">Maksuvirran käynnistäminen epäonnistui. Yritä myöhemmin uudelleen!</string>
     <string name="failed_to_load_inapp_purchases">Sovelluksen sisäisen oston tietoja ei onnistuttu lataamaan. Yritä myöhemmin uudelleen!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Kun toistat tallentamattomia esiasetuksia, ota käyttöön ohituspainikkeet soittimen ilmoituksessa satunnaisten esiasetusten luomiseksi</string>
-    <string name="should_allow_skipping_unsaved_presets">Salli tallentamattomien esiasetusten ohittaminen</string>
     <string name="should_share_usage_data_summary">Jaa käyttö- ja käyttäytymistiedot automaattisesti kehittäjien kanssa</string>
     <string name="should_share_usage_data">Jaa käyttö- ja käyttäytymistiedot</string>
     <string name="others">Muut</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 82b537bb1..660ec3b2a 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -192,8 +192,6 @@
     <string name="remove_all_app_shortcuts_confirmation">Ça supprimera tous les raccourcis prédéfinis du menu des raccourcis de l’application. Voulez-vous continuer \?</string>
     <string name="remove_all_app_shortcuts">Retirer tous les raccourcis de l’appli</string>
     <string name="should_display_sound_icons">Afficher les icônes de son</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Lors de la lecture de préréglages non sauvegardés, activez les boutons de saut dans la notification du lecteur pour générer des préréglages aléatoires</string>
-    <string name="should_allow_skipping_unsaved_presets">Permettre de sauter les préréglages non sauvegardés</string>
     <string name="should_share_usage_data_summary">Partager automatiquement les données d\'utilisation et de comportement avec les développeurs</string>
     <string name="should_share_usage_data">Partager les données d\'utilisation et de comportement</string>
     <string name="others">Autres</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ce30c5eac..49bd52658 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -199,8 +199,6 @@
     <string name="payment_pending">जैसे ही हम आपका भुगतान संसाधित कर लेंगे, हम आपको सूचित करेंगे।</string>
     <string name="failed_to_purchase">भुगतान प्रवाह प्रारंभ करने में विफल. कृपया बाद में पुन: प्रयास करें!</string>
     <string name="failed_to_load_inapp_purchases">इन-ऐप खरीदारी विवरण लोड करने में विफल। कृपया बाद में पुन: प्रयास करें!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">सहेजे नहीं गए प्रीसेट चलाते समय, यादृच्छिक प्रीसेट जेनरेट करने के लिए प्लेयर नोटिफिकेशन में स्किप बटन सक्षम करें</string>
-    <string name="should_allow_skipping_unsaved_presets">सहेजे नहीं गए प्रीसेट को छोड़ने की अनुमति दें</string>
     <string name="should_share_usage_data_summary">डेवलपर्स के साथ स्वचालित रूप से उपयोग और व्यवहार डेटा साझा करें</string>
     <string name="should_share_usage_data">शेयर यूसेज एंड बिहेवियर डेटा</string>
     <string name="others">अन्य</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index d332f98e7..75a002c47 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -201,7 +201,6 @@
     <string name="presets_as_home_screen">Preset tersimpan sebagai layar beranda</string>
     <string name="app_authors">Lihat daftar Penulis Noice</string>
     <string name="should_display_sound_icons">Tunjukkan ikon suara</string>
-    <string name="should_allow_skipping_unsaved_presets">Izinkan melewati preset tak tersimpan</string>
     <string name="should_share_usage_data_summary">Secara otomatis berbagi data penggunaan dan perilaku dengan pengembang</string>
     <string name="should_share_usage_data">Bagikan data penggunaan dan perilaku</string>
     <string name="others">Lainnya</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index c475c544f..2d190754b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -176,8 +176,6 @@
     <string name="payment_pending">Ti avviseremo non appena avremo finito di elaborare il tuo pagamento.</string>
     <string name="failed_to_purchase">Impossibile avviare il flusso di pagamento. Si prega di riprovare più tardi!</string>
     <string name="failed_to_load_inapp_purchases">Impossibile caricare i dettagli dell\'acquisto in-app. Si prega di riprovare più tardi!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Durante la riproduzione di preimpostazioni non salvate, abilita i pulsanti di salto nella notifica del lettore per generare preimposatzioni casuali</string>
-    <string name="should_allow_skipping_unsaved_presets">Permetti di saltare le preimpostazioni non salvate</string>
     <string name="should_share_usage_data_summary">Condividi automaticamente i dati di utilizzo e di comportamento con gli sviluppatori</string>
     <string name="should_share_usage_data">Condividi i dati sull\'uso e sul comportamento</string>
     <string name="others">Altri</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c7d4f982f..738536a8f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -146,8 +146,6 @@
     <string name="payment_pending">お支払いの処理が完了したら、すぐにお知らせします。</string>
     <string name="failed_to_purchase">支払フローを開始できませんでした。後でもう一度お試しください!</string>
     <string name="failed_to_load_inapp_purchases">アプリ内課金の詳細を読み込めませんでした。後でもう一度お試しください!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">保存されていないプリセットを再生する場合、プレーヤー通知にランダムプリセットを生成するためのスキップボタンを有効化する</string>
-    <string name="should_allow_skipping_unsaved_presets">保存されていないプリセットのスキップを許可</string>
     <string name="should_share_usage_data_summary">使用状況と動作データを開発者と共有する</string>
     <string name="should_share_usage_data">使用状況と動作データの共有</string>
     <string name="others">その他</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index a41a74f39..7d0aebea0 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -169,7 +169,6 @@
     <string name="sound_group__life">Gyvybė</string>
     <string name="volume">Garsumas</string>
     <string name="stop">Sustabdyti</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Grojant neišsaugotas parinktis, įgalinkite praleidimo mygtukus grotuvo pranešime, kad būtų generuojamos atsitiktinės parinktys</string>
     <string name="sound_fade_in_duration_summary">Tolygaus garsėjimo pradžioje trukmė (sekundėmis)</string>
     <string name="sound_fade_in_duration">Garso tolygaus garsėjimo pradžioje trukmė</string>
     <string name="repeat_time_period">Pakartojimo laikotarpis</string>
@@ -182,7 +181,6 @@
         <item quantity="few">%1$d minutės</item>
         <item quantity="other">%1$d minučių</item>
     </plurals>
-    <string name="should_allow_skipping_unsaved_presets">Leisti praleisti neišsaugotas parinktis</string>
     <string name="should_share_usage_data_summary">Automatinis naudojimo ir elgsenos duomenų bendrinimas su kūrėjais</string>
     <string name="should_share_usage_data">Dalytis naudojimo ir elgsenos duomenimis</string>
     <string name="others">Kita</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 611de5ad4..160afb181 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -179,8 +179,6 @@
     <string name="payment_pending">Notificaremos você assim que terminarmos de processar seu pagamento.</string>
     <string name="failed_to_purchase">Falha ao iniciar o fluxo de pagamento. Por favor, tente novamente mais tarde!</string>
     <string name="failed_to_load_inapp_purchases">Falha ao carregar os detalhes de compra no aplicativo. Por favor, tente novamente mais tarde!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Ao reproduzir predefinições não salvas, habilite os botões de pular na notificação do reprodutor de som para gerar predefinições aleatórias</string>
-    <string name="should_allow_skipping_unsaved_presets">Permitir pular predefinições não salvas</string>
     <string name="should_share_usage_data_summary">Compartilhar automaticamente dados de uso e comportamento com os desenvolvedores</string>
     <string name="should_share_usage_data">Compartilhar dados de uso e comportamento</string>
     <string name="others">Outros</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 5e73e1c11..e9407292b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -119,8 +119,6 @@
     <string name="payment_pending">Vamos notificá-lo assim que terminarmos o processamento do seu pagamento.</string>
     <string name="failed_to_purchase">Não foi possível iniciar o processo de pagamento. Por favor,tente novamente mais tarde!</string>
     <string name="failed_to_load_inapp_purchases">Não foi possível carregar os detalhes da compra na aplicação. Por favor tente de novo mais tarde!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Ao reproduzir misturas de sons não guardadas, ativa os botões de ignorar na notificação do reprodutor de som para gerar misturas de sons aleatórias</string>
-    <string name="should_allow_skipping_unsaved_presets">Permitir ignorar misturas de sons não guardadas</string>
     <string name="should_share_usage_data_summary">Partilhar automaticamente dados de utilização e comportamento com os programadores</string>
     <string name="should_share_usage_data">Partilhar dados de utilização e comportamento</string>
     <string name="others">Outros</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 79336b957..c1e5a1b2e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -205,8 +205,6 @@
     <string name="payment_pending">Мы сообщим вам, как только закончим обработку вашего платежа.</string>
     <string name="failed_to_purchase">Не удалось запустить поток платежей. Повторите попытку позже!</string>
     <string name="failed_to_load_inapp_purchases">Не удалось загрузить сведения о покупке в приложении. Пожалуйста, повторите попытку позже!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">При воспроизведении несохраненных предустановок включите кнопки пропуска в уведомлении плеера, чтобы генерировать случайные предустановки</string>
-    <string name="should_allow_skipping_unsaved_presets">Разрешить пропуск несохраненных предустановок</string>
     <string name="should_share_usage_data_summary">Автоматически отправлять разработчикам данные об использовании и поведении</string>
     <string name="should_share_usage_data">Передача данных об использовании и поведении</string>
     <string name="share_usage_data_consent_message">Мы собираем данные об использовании приложения для улучшения пользовательского опыта. Мы также собираем данные о поведении приложения для анализа и диагностики ошибок, возникающих во время использования приложения. Для получения дополнительной информации ознакомьтесь с нашей [политикой конфиденциальности] (https://ashutoshgngwr.github.io/noice/privacy-policy).
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 00ae1cabe..bf1101fcf 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -207,8 +207,6 @@
     <string name="payment_pending">Ödemenizi işlemeyi bitirir bitirmez sizi bilgilendireceğiz.</string>
     <string name="failed_to_purchase">Ödeme akışı başlatılamadı. Lütfen daha sonra tekrar deneyin!</string>
     <string name="failed_to_load_inapp_purchases">Uygulama içi satın alma ayrıntıları yüklenemedi. Lütfen daha sonra tekrar deneyin!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Kaydedilmemiş kayıtları oynatırken, rastgele kayıtlar oluşturmak için oynatıcı bildirimindeki atlama düğmelerini etkinleştirin</string>
-    <string name="should_allow_skipping_unsaved_presets">Kaydedilmemiş kayıtların atlanmasına izin ver</string>
     <string name="should_share_usage_data_summary">Kullanım ve davranış verilerini geliştiricilerle otomatik olarak paylaşın</string>
     <string name="should_share_usage_data">Kullanım ve davranış verilerini paylaş</string>
     <string name="others">Diğer</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index aec05db51..a9cb11476 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -186,8 +186,6 @@
     <string name="payment_pending">Ми повідомимо вас, щойно завершимо обробку платежу.</string>
     <string name="failed_to_purchase">Не вдалося запустити потік платежів. Повторіть спробу пізніше!</string>
     <string name="failed_to_load_inapp_purchases">Не вдалося завантажити відомості про придбання через застосунок. Повторіть спробу пізніше!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Під час відтворення незбереженого поєднання вмикати кнопки пропуску в сповіщенні програвача для створення поєднань</string>
-    <string name="should_allow_skipping_unsaved_presets">Дозволити пропускати незбережені поєднання</string>
     <string name="should_share_usage_data_summary">Автоматично надсилати розробникам дані про користування та поведінку</string>
     <string name="should_share_usage_data">Надсилання даних про користування та поведінку</string>
     <string name="others">Інші</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2465130a6..27c29b1c1 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -174,8 +174,6 @@
     <string name="payment_pending">Chúng tôi sẽ thông báo cho bạn ngay sau khi chúng tôi hoàn tất xử lý thanh toán của bạn.</string>
     <string name="failed_to_purchase">Khởi động dòng chảy thanh toán thất bại. Vui lòng thử lại sau!</string>
     <string name="failed_to_load_inapp_purchases">Tải chi tiết mua hàng trong ứng dụng thất bại. Vui lòng thử lại sau!</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">Khi phát các thiết lập trước chưa được lưu, bật các nút bỏ qua trong thông báo trình phát để tạo các thiết lập trước ngẫu nhiên</string>
-    <string name="should_allow_skipping_unsaved_presets">Cho phép bỏ qua các thiết lập trước chưa được lưu</string>
     <string name="should_share_usage_data_summary">Tự động chia sẻ dữ liệu sử dụng và hành vi với những nhà phát triển</string>
     <string name="should_share_usage_data">Chia sẻ dữ liệu sử dụng và hành vi</string>
     <string name="others">Khác</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 434579c3b..6d4c16ae2 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -31,5 +31,5 @@
   <string name="should_display_sound_icons_key">should_display_sound_icons</string>
   <string name="others_key">others</string>
   <string name="should_share_usage_data_key">should_share_usage_data</string>
-  <string name="should_allow_skipping_unsaved_presets_key">should_allow_skipping_unsaved_presets</string>
+  <string name="enable_media_buttons_key">enable_media_buttons</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ed7211a9..cf5ee0d55 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -222,10 +222,10 @@
     <string name="others">Others</string>
     <string name="should_share_usage_data">Share usage and behaviour data</string>
     <string name="should_share_usage_data_summary">Automatically share usage and behaviour data with the developers</string>
-    <string name="should_allow_skipping_unsaved_presets">Allow skipping unsaved presets</string>
-    <string name="should_allow_skipping_unsaved_presets_summary">When playing unsaved presets, enable skip buttons in player notification to generate random presets</string>
     <string name="failed_to_load_inapp_purchases">Failed to load in-app purchase details. Please try again later!</string>
     <string name="failed_to_purchase">Failed to start payment flow. Please try again later!</string>
     <string name="payment_pending">We\'ll notify you as soon as we finish processing your payment.</string>
     <string name="created_by">Created by</string>
+    <string name="enable_media_buttons">Enable media buttons</string>
+    <string name="enable_media_buttons_summary">Use hardware media buttons to skip presets when playing saved presets</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index b55a68b94..c8af8bc73 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -30,10 +30,10 @@
 
     <SwitchPreferenceCompat
       android:defaultValue="true"
-      android:icon="@drawable/ic_settings_skip_unsaved_presets"
-      android:key="@string/should_allow_skipping_unsaved_presets_key"
-      android:summary="@string/should_allow_skipping_unsaved_presets_summary"
-      android:title="@string/should_allow_skipping_unsaved_presets" />
+      android:icon="@drawable/ic_settings_media_buttons"
+      android:key="@string/enable_media_buttons_key"
+      android:summary="@string/enable_media_buttons_summary"
+      android:title="@string/enable_media_buttons" />
 
   </PreferenceCategory>