6 files changed, 21 insertions, 23 deletions
diff --git a/app/src/main/res/drawable/password_row_background.xml b/app/src/main/res/drawable/password_row_background.xml
index 20b8540f..51f14173 100644
--- a/app/src/main/res/drawable/password_row_background.xml
+++ b/app/src/main/res/drawable/password_row_background.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item>
-        <selector>
-            <item app:state_multiselected="true" android:state_activated="true">
-                <color android:color="@color/list_multiselect_background" />
-            </item>
-        </selector>
-    </item>
-    <item android:drawable="?attr/selectableItemBackground" />
+<!--
+Requires a layer-list since attributes cannot be resolved in selectors, see:
+https://stackoverflow.com/a/36424426/297261
+ -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <selector>
+        <item android:drawable="@color/list_multiselect_background" android:state_selected="true" />
+        <item android:drawable="@android:color/transparent"/>
+    </selector>
+</item>
+<item android:drawable="?android:attr/selectableItemBackground"/>
 </layer-list>
diff --git a/app/src/main/res/layout/oreo_autofill_filter_row.xml b/app/src/main/res/layout/oreo_autofill_filter_row.xml
index c60c2693..8ba0c3dd 100644
--- a/app/src/main/res/layout/oreo_autofill_filter_row.xml
+++ b/app/src/main/res/layout/oreo_autofill_filter_row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.zeapo.pwdstore.widget.MultiselectableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -61,4 +61,4 @@
         app:layout_constraintStart_toEndOf="@id/title"
         app:layout_constraintTop_toTopOf="parent" />
 
-</com.zeapo.pwdstore.widget.MultiselectableConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index ae76d7a9..257b9d4c 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.zeapo.pwdstore.widget.MultiselectableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -52,4 +52,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-</com.zeapo.pwdstore.widget.MultiselectableConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4d174061..a703ba9f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -318,8 +318,6 @@
     <string name="button_create">Создать</string>
     <string name="pref_search_on_start">Открыть поиск на старте</string>
     <string name="pref_search_on_start_hint">Открыть панель поиска при запуске приложения</string>
-    <string name="pref_search_from_root">Всегда начинать поиск от корня</string>
-    <string name="pref_search_from_root_hint">Искать от корня хранилища независимо от текущей открытой директории</string>
     <string name="password_generator_category_title">Генератор паролей</string>
     <string name="tap_clear_clipboard">Нажмите здесь чтобы очистить буфер обмена</string>
     <string name="clone_git_repo">Для синхронизации изменений клонируйте git репозиторий</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87d97d5b..8637235b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <plurals name="delete_title">
+        <item quantity="one">%d item selected</item>
+        <item quantity="other">%d items selected</item>
+    </plurals>
+
     <!-- Activity names -->
     <string name="app_name" translatable="false">Password Store</string>
 
@@ -330,8 +335,6 @@
     <string name="button_create">Create</string>
     <string name="pref_search_on_start">Open search on start</string>
     <string name="pref_search_on_start_hint">Open search bar when app is launched</string>
-    <string name="pref_search_from_root">Always search from root</string>
-    <string name="pref_search_from_root_hint">Search from root of store regardless of currently open directory</string>
     <string name="password_generator_category_title">Password Generator</string>
     <string name="tap_clear_clipboard">Tap here to clear clipboard</string>
     <string name="clone_git_repo">Clone a git repository to sync changes</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 31c6de5a..fc041ee1 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -147,11 +147,6 @@
             app:key="search_on_start"
             app:summary="@string/pref_search_on_start_hint"
             app:title="@string/pref_search_on_start" />
-        <androidx.preference.CheckBoxPreference
-            app:defaultValue="false"
-            app:key="search_from_root"
-            app:summary="@string/pref_search_from_root_hint"
-            app:title="@string/pref_search_from_root" />
         <androidx.preference.ListPreference
             app:title="@string/pref_sort_order_title"
             app:defaultValue="FOLDER_FIRST"