Merge branch 'main' into fix/73-notch-handling

2023-07-28 11:59:38 +02:00 · 2023-07-28 11:59:38 +02:00 · 0a1af2f75e
parent babd6bee9d 73b7638a93
commit 0a1af2f75e
45 changed files with 109 additions and 16 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -63,7 +63,7 @@ android {
 }

 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:a26066d67d'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:fad9b2cdb0'

    kapt "androidx.room:room-compiler:2.5.2"
    implementation "androidx.room:room-runtime:2.5.2"
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt
@ -21,6 +21,7 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
+import android.os.Looper
 import android.provider.Telephony
 import android.telecom.TelecomManager
 import android.view.*
@ -32,9 +33,7 @@ import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.isVisible
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ensureBackgroundThread
-import com.simplemobiletools.commons.helpers.isPiePlus
-import com.simplemobiletools.commons.helpers.isQPlus
+import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.launcher.BuildConfig
 import com.simplemobiletools.launcher.R
 import com.simplemobiletools.launcher.dialogs.RenameItemDialog
@ -54,8 +53,6 @@ import kotlinx.android.synthetic.main.widgets_fragment.view.*
 import kotlin.math.abs

 class MainActivity : SimpleActivity(), FlingListener {
-    private val ANIMATION_DURATION = 150L
-
    private var mTouchDownX = -1
    private var mTouchDownY = -1
    private var mAllAppsFragmentY = 0
@ -76,6 +73,8 @@ class MainActivity : SimpleActivity(), FlingListener {

    companion object {
        private var mLastUpEvent = 0L
+        private const val ANIMATION_DURATION = 150L
+        private const val APP_DRAWER_CLOSE_DELAY = 300L
    }

    override fun onCreate(savedInstanceState: Bundle?) {
@ -490,6 +489,16 @@ class MainActivity : SimpleActivity(), FlingListener {
        }
    }

+    fun closeAppDrawer() {
+        if (isAllAppsFragmentExpanded()) {
+            Handler(Looper.getMainLooper()).postDelayed({
+                all_apps_fragment.y = mScreenHeight.toFloat()
+                all_apps_fragment.all_apps_grid.scrollToPosition(0)
+                home_screen_grid.fragmentCollapsed()
+            }, APP_DRAWER_CLOSE_DELAY)
+        }
+    }
+
    private fun performItemClick(clickedGridItem: HomeScreenGridItem) {
        if (clickedGridItem.type == ITEM_TYPE_ICON) {
            launchApp(clickedGridItem.packageName, clickedGridItem.activityName)
@ -585,7 +594,7 @@ class MainActivity : SimpleActivity(), FlingListener {
            menu.findItem(R.id.hide_icon).isVisible = gridItem.type == ITEM_TYPE_ICON && isOnAllAppsFragment
            menu.findItem(R.id.resize).isVisible = gridItem.type == ITEM_TYPE_WIDGET
            menu.findItem(R.id.app_info).isVisible = gridItem.type == ITEM_TYPE_ICON
-            menu.findItem(R.id.uninstall).isVisible = gridItem.type == ITEM_TYPE_ICON
+            menu.findItem(R.id.uninstall).isVisible = gridItem.type == ITEM_TYPE_ICON && canAppBeUninstalled(gridItem.packageName)
            menu.findItem(R.id.remove).isVisible = !isOnAllAppsFragment
            setOnMenuItemClickListener { item ->
                resetFragmentTouches()
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/SettingsActivity.kt
@ -38,6 +38,7 @@ class SettingsActivity : SimpleActivity() {
        setupPurchaseThankYou()
        setupCustomizeColors()
        setupUseEnglish()
+        setupCloseAppDrawerOnOtherAppOpen()
        setupDrawerColumnCount()
        setupDrawerSearchBar()
        setupHomeRowCount()
@ -46,7 +47,12 @@ class SettingsActivity : SimpleActivity() {
        setupManageHiddenIcons()
        updateTextColors(settings_holder)

-        arrayOf(settings_color_customization_section_label, settings_general_settings_label, settings_drawer_settings_label, settings_home_screen_label).forEach {
+        arrayOf(
+            settings_color_customization_section_label,
+            settings_general_settings_label,
+            settings_drawer_settings_label,
+            settings_home_screen_label
+        ).forEach {
            it.setTextColor(getProperPrimaryColor())
        }
    }
@ -92,6 +98,14 @@ class SettingsActivity : SimpleActivity() {
        }
    }

+    private fun setupCloseAppDrawerOnOtherAppOpen() {
+        settings_close_app_drawer_on_other_app.isChecked = config.closeAppDrawer
+        settings_close_app_drawer_on_other_app_holder.setOnClickListener {
+            settings_close_app_drawer_on_other_app.toggle()
+            config.closeAppDrawer = settings_close_app_drawer_on_other_app.isChecked
+        }
+    }
+
    private fun setupDrawerColumnCount() {
        val currentColumnCount = config.drawerColumnCount
        settings_drawer_column_count.text = currentColumnCount.toString()
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/extensions/Activity.kt
@ -3,6 +3,7 @@ package com.simplemobiletools.launcher.extensions
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Intent
+import android.content.pm.ApplicationInfo
 import android.net.Uri
 import android.provider.Settings
 import com.simplemobiletools.commons.extensions.showErrorToast
@ -41,6 +42,14 @@ fun Activity.launchAppInfo(packageName: String) {
    }
 }

+fun Activity.canAppBeUninstalled(packageName: String): Boolean {
+    return try {
+        (packageManager.getApplicationInfo(packageName, 0).flags and ApplicationInfo.FLAG_SYSTEM) == 0
+    } catch (ignored: Exception) {
+        false
+    }
+}
+
 fun Activity.uninstallApp(packageName: String) {
    Intent(Intent.ACTION_DELETE).apply {
        data = Uri.fromParts("package", packageName, null)
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt
@ -120,6 +120,9 @@ class AllAppsFragment(context: Context, attributeSet: AttributeSet) : MyFragment
            if (currAdapter == null) {
                LaunchersAdapter(activity!!, launchers, this) {
                    activity?.launchApp((it as AppLauncher).packageName, it.activityName)
+                    if (activity?.config?.closeAppDrawer == true) {
+                        activity?.closeAppDrawer()
+                    }
                    ignoreTouches = false
                    touchDownY = -1
                }.apply {
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Config.kt
@ -28,4 +28,8 @@ class Config(context: Context) : BaseConfig(context) {
    var showSearchBar: Boolean
        get() = prefs.getBoolean(SHOW_SEARCH_BAR, true)
        set(showSearchBar) = prefs.edit().putBoolean(SHOW_SEARCH_BAR, showSearchBar).apply()
+
+    var closeAppDrawer: Boolean
+        get() = prefs.getBoolean(CLOSE_APP_DRAWER, false)
+        set(closeAppDrawer) = prefs.edit().putBoolean(CLOSE_APP_DRAWER, closeAppDrawer).apply()
 }
--- a/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/launcher/helpers/Constants.kt
@ -9,6 +9,7 @@ const val HOME_ROW_COUNT = "home_row_count"
 const val HOME_COLUMN_COUNT = "home_column_count"
 const val DRAWER_COLUMN_COUNT = "drawer_column_count"
 const val SHOW_SEARCH_BAR = "show_search_bar"
+const val CLOSE_APP_DRAWER = "close_app_drawer"

 // default home screen grid size
 const val ROW_COUNT = 6
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@ -173,7 +173,7 @@

            <RelativeLayout
                android:id="@+id/settings_drawer_search_holder"
-                style="@style/SettingsHolderTextViewOneLinerStyle"
+                style="@style/SettingsHolderCheckboxStyle"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@drawable/ripple_background">
@ -187,6 +187,22 @@

            </RelativeLayout>

+            <RelativeLayout
+                android:id="@+id/settings_close_app_drawer_on_other_app_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ripple_background">
+
+                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_close_app_drawer_on_other_app"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/close_app_drawer_on_app_open" />
+
+            </RelativeLayout>
+
            <include
                android:id="@+id/settings_drawer_settings_divider"
                layout="@layout/divider" />
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">اﻷيقونات المخفية</string>
    <string name="hidden_icons_placeholder">لا يمكن إلغاء تثبيت بعض التطبيقات بسبب قيود النظام، ولكن يمكن إخفاء أيقوناتها لتجنب ظهورها.</string>
    <string name="app_drawer_settings">درج التطبيق</string>
+    <string name="close_app_drawer_on_app_open">إغلاق درج التطبيق عند فتح تطبيق</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">الأداة كبيرة جدًا بالنسبة لحجم الشاشة الرئيسية الحالي</string>
    <!--
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Скрити икони</string>
    <string name="hidden_icons_placeholder">Някои приложения не могат да бъдат деинсталирани поради системни ограничения, но можете поне да скриете иконите им, за да не ги виждате.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Icones ocultes</string>
    <string name="hidden_icons_placeholder">Algunes aplicacions no es poden desinstal·lar a causa de les restriccions del sistema, però almenys podeu ocultar les seves icones per evitar que es vegin.</string>
    <string name="app_drawer_settings">Calaix d\'aplicacions</string>
+    <string name="close_app_drawer_on_app_open">Tanca el calaix d\'aplicacions en obrir una aplicació</string>
    <string name="home_screen_settings">Home screen</string>
-    <string name="widget_too_big">El giny és massa gran per a la mida actual de la pantalla d\'inici</string>
+    <string name="widget_too_big">El giny és massa gros per a la mida de la pantalla d\'inici actual</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Skryté ikony</string>
    <string name="hidden_icons_placeholder">Některé aplikace nelze kvůli systémovým omezením odinstalovat. Ale můžete alespoň skrýt jejich ikony, abyste je neviděli.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Ausgeblendete Symbole</string>
    <string name="hidden_icons_placeholder">Einige Apps können aufgrund von Systemeinschränkungen nicht deinstalliert werden, aber du kannst zumindest ihre Symbole ausblenden, um sie nicht zu sehen.</string>
    <string name="app_drawer_settings">App-Schublade</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Startbildschirm</string>
    <string name="widget_too_big">Das Widget ist zu groß für den aktuellen Startbildschirm</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Κρυφά εικονίδια</string>
    <string name="hidden_icons_placeholder">Ορισμένες εφαρμογές δεν μπορούν να απεγκατασταθούν λόγω περιορισμών του συστήματος, αλλά μπορείτε να αποκρύψετε τα εικονίδια τους για να μην φαίνονται.</string>
    <string name="app_drawer_settings">Συρτάρι εφαρμογών</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Iconos ocultos</string>
    <string name="hidden_icons_placeholder">Algunas aplicaciones no se pueden desinstalar debido a las restricciones del sistema, pero al menos puedes ocultar sus iconos para evitar verlas.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Peidetud ikoonid</string>
    <string name="hidden_icons_placeholder">Mõnda rakendust ei saa süsteemipiirangute tõttu eemaldada. Selleks, et neid mitte näha, võid vähemalt nende ikoonid ära peita.</string>
    <string name="app_drawer_settings">Rakenduste kaust</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Avaleht</string>
    <string name="widget_too_big">Vidin on liiga suur praeguse ekraanimõõdu jaoks</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Piilotetut kuvakkeet</string>
    <string name="hidden_icons_placeholder">Joitakin sovelluksia ei ole järjestelmärajoitusten vuoksi mahdollista poistaa, mutta voit kuitenkin piilottaa niiden kuvakkeet näkyvistä.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Icônes cachées</string>
    <string name="hidden_icons_placeholder">Certaines applications ne peuvent pas être désinstallées en raison de restrictions du système, mais vous pouvez au moins masquer leurs icônes pour éviter de les voir.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Iconas ocultas</string>
    <string name="hidden_icons_placeholder">Algunhas aplicacións non se poden desinstalar debido ás restricións do sistema, pero polo menos podes ocultar as súas iconas para evitar velas.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Skrivene ikone</string>
    <string name="hidden_icons_placeholder">Neke aplikacije se ne mogu deinstalirati zbog ograničenja sustava, ali njihove ikone možeš sakriti.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Rejtett ikonok</string>
    <string name="hidden_icons_placeholder">Egyes alkalmazások rendszerkorlátozások miatt nem távolíthatók el, de legalább elrejtheti az ikonjaikat, hogy ne lássa őket.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Ikon tersembunyi</string>
    <string name="hidden_icons_placeholder">Beberapa aplikasi tidak dapat di-uninstal karena keterbatasan sistem, tetapi Anda masih dapat menyembunyikan ikon mereka untuk menyembunyikannya.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Icone nascoste</string>
    <string name="hidden_icons_placeholder">Alcune applicazioni non possono essere disinstallate a causa di restrizioni di sistema, ma è possibile almeno nascondere le loro icone per evitare di vederle.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">אייקונים נסתרים</string>
    <string name="hidden_icons_placeholder">חלק מהאפליקציות לא ניתנות להסרה עקב הגבלות מערכת, לפחות אתה יכול להחביא את האייקונים כדי לא לראותם במסך הבית.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">非表示のアイコン</string>
    <string name="hidden_icons_placeholder">一部のアプリはシステムの制限によりアンインストールできませんが、非表示によって表示されないようにすることはできます。</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Hidden icons</string>
    <string name="hidden_icons_placeholder">Some apps cannot be uninstalled due to system restrictions, but you can at least hide their icons to avoid seeing them.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">മറഞ്ഞിരിക്കുന്ന ബിംബ</string>
    <string name="hidden_icons_placeholder">സിസ്റ്റം നിയന്ത്രണങ്ങൾ കാരണം ചില ആപ്പുകൾ അൺഇൻസ്‌റ്റാൾ ചെയ്യാൻ കഴിയില്ല, എന്നാൽ അവ കാണാതിരിക്കാൻ നിങ്ങൾക്ക് അവയുടെ ഐക്കണുകളെങ്കിലും മറയ്‌ക്കാം.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Skjulte ikoner</string>
    <string name="hidden_icons_placeholder">Noen apper kan ikke avinstalleres pga. systemrestriksjoner, men du kan i det minste skjule deres ikoner for å unngå å se dem.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Verborgen iconen</string>
    <string name="hidden_icons_placeholder">Sommige apps kunnen niet worden verwijderd van het systeem, maar hun iconen kunnen wel worden verborgen.</string>
    <string name="app_drawer_settings">App-overzicht</string>
+    <string name="close_app_drawer_on_app_open">App-overzicht sluiten na het kiezen van een app</string>
    <string name="home_screen_settings">Beginscherm</string>
    <string name="widget_too_big">Widget is te groot voor de huidige afmetingen van het beginscherm</string>
 </resources>
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">لُکاۓ آئیکون</string>
    <string name="hidden_icons_placeholder">سِسٹم پابندیاں کرکے کجھ اَیپاں اݨ‌اینسٹال کر نہیں سکیاں، پر تسیں آئیکون لُکا سکدے او۔</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Ukryte ikony</string>
    <string name="hidden_icons_placeholder">Niektórych aplikacji nie można odinstalować ze względu na ograniczenia systemowe, ale możesz przynajmniej ukryć ich ikony, aby ich nie widzieć.</string>
    <string name="app_drawer_settings">Szuflada aplikacji</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Ekran główny</string>
    <string name="widget_too_big">Widżet jest za duży dla aktualnego rozmiaru ekranu głównego</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Ícones ocultos</string>
    <string name="hidden_icons_placeholder">Alguns aplicativos não podem ser desinstalados devido a restrições do sistema, mas você pode ao menos ocultar seus ícones para evitar vê-los.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -12,10 +12,11 @@
    <string name="hidden_icons">Ícones ocultos</string>
    <string name="hidden_icons_placeholder">Algumas aplicações não podem ser desinstaladas mas pode ocultar os seus ícones.</string>
    <string name="app_drawer_settings">Menu de aplicações</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">O Widget é muito grande para o ecrã disponível</string>
    <!--
        Haven't found some strings? There's more at
        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
    -->
-</resources>
+</resources>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Hidden icons</string>
    <string name="hidden_icons_placeholder">Some apps cannot be uninstalled due to system restrictions, but you can at least hide their icons to avoid seeing them.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Скрытые значки</string>
    <string name="hidden_icons_placeholder">Некоторые приложения нельзя удалить из-за системных ограничений, но можно скрыть их значки.</string>
    <string name="app_drawer_settings">Панель приложения</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Домашний экран</string>
    <string name="widget_too_big">Виджет слишком велик для текущего размера домашнего экрана</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Skryté ikonky</string>
    <string name="hidden_icons_placeholder">Niektoré apky nemôžu byť odinštalované kvôli systémovým obmedzeniam, viete ich ale aspoň skryť, aby ste ich nevideli.</string>
    <string name="app_drawer_settings">Zoznam apiek</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Domáca obrazovka</string>
    <string name="widget_too_big">Widget je príliš veľký pre súčasnú domácu obrazovku</string>
    <!--
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Skrite ikone</string>
    <string name="hidden_icons_placeholder">Določenih aplikacij zaradi sistemskih omejitev ni mogoče odstraniti, njihove ikone pa skrijete, da jih ne vidite.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Скривене иконе</string>
    <string name="hidden_icons_placeholder">Неке апликације се не могу деинсталирати због системских ограничења, али можете барем сакрити њихове иконе да их не видите.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Dolda ikoner</string>
    <string name="hidden_icons_placeholder">Vissa appar kan inte avinstalleras på grund av systembegränsningar, men du kan åtminstone dölja deras ikoner för att slippa se dem.</string>
    <string name="app_drawer_settings">Applåda</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Startskärm</string>
    <string name="widget_too_big">Widgeten är för stor för startskärmens aktuella storlek</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Gizli simgeler</string>
    <string name="hidden_icons_placeholder">Bazı uygulamalar sistem kısıtlamaları nedeniyle kaldırılamaz, ancak en azından onları görmemek için simgelerini gizleyebilirsiniz.</string>
    <string name="app_drawer_settings">Uygulama çekmecesi</string>
+    <string name="close_app_drawer_on_app_open">Bir uygulama açıldığında uygulama çekmecesini kapat</string>
    <string name="home_screen_settings">Ana ekran</string>
    <string name="widget_too_big">Widget, şu anki ana ekran boyutu için çok büyük</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Приховані піктограми</string>
    <string name="hidden_icons_placeholder">Деякі застосунки не можна видалити через системні обмеження, але ви можете принаймні приховати їх піктограми, щоб уникнути їх перегляду.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-zgh/strings.xml
+++ b/app/src/main/res/values-zgh/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">ⵜⵉⵙⵓⵔⴰ ⵉⴼⴼⵔⵏ</string>
    <string name="hidden_icons_placeholder">ⵓⵔ ⵜⵣⵔⵉⵏ ⵜⵓⵙⵙⵔⴰ ⵏ ⴽⵔⴰ ⵏ ⵜⵙⵏⵙⵉⵡⵉⵏ ⵙ ⵜⵎⵏⵜⵉⵍⵜ ⵏ ⵉⵙⵍⴳⵏⵏ ⵏ ⵓⵏⴳⵔⴰⵡ, ⵎⴰⵛⴰ ⵜⵣⵔⵉ ⵜⵓⴼⴼⵔⴰ ⵏ ⵜⵙⵓⵔⴰ ⵏⵏⵙⵏⵜ ⵃⵎⴰ ⵓⵔ ⴷ ⵜⵜⴹⵀⴰⵕⵏⵜ.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">隐藏的图标</string>
    <string name="hidden_icons_placeholder">某些应用因系统限制而无法卸载， 但你至少可以隐藏它们的图标避免看见它们。</string>
    <string name="app_drawer_settings">应用抽屉</string>
+    <string name="close_app_drawer_on_app_open">打开抽屉内应用时关闭抽屉</string>
    <string name="home_screen_settings">主屏幕</string>
    <string name="widget_too_big">小部件对当前屏幕尺寸而言太大了</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">隱藏圖示</string>
    <string name="hidden_icons_placeholder">由於系統限制，有些應用程式無法被移除，但您至少可以將它們的圖示隱藏起來，避免看到它們。</string>
    <string name="app_drawer_settings">應用程式抽屜</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -12,6 +12,7 @@
    <string name="hidden_icons">Hidden icons</string>
    <string name="hidden_icons_placeholder">Some apps cannot be uninstalled due to system restrictions, but you can at least hide their icons to avoid seeing them.</string>
    <string name="app_drawer_settings">App drawer</string>
+    <string name="close_app_drawer_on_app_open">Close app drawer on opening an app</string>
    <string name="home_screen_settings">Home screen</string>
    <string name="widget_too_big">Widget is too big for current home screen size</string>
    <!--