Merge branch 'master' into devel

app/src/main/res/layout/item_search_complete.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-	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"
-	android:layout_height="?listPreferredItemHeightSmall"
-	android:background="?selectableItemBackground"
-	android:drawablePadding="20dp"
-	android:gravity="center_vertical"
-	android:paddingStart="?listPreferredItemPaddingStart"
-	android:paddingEnd="?listPreferredItemPaddingEnd"
-	android:textAppearance="?textAppearanceListItemSmall"
-	android:textColor="?android:textColorPrimary"
-	android:theme="@style/ThemeOverlay.Kotatsu"
-	app:drawableStartCompat="@drawable/ic_history"
-	tools:text="@tools:sample/full_names" />

app/src/main/res/raw/keep.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+	tools:keep="@drawable/ic_denied_large,@drawable/ic_alert_outline,@drawable/ic_error_large" />

app/src/main/res/values-ru/strings.xml

@@ -214,4 +214,7 @@
 	<string name="languages">Языки</string>
 	<string name="welcome">Добро пожаловать</string>
 	<string name="text_clear_search_history_prompt">Вы действительно хотите удалить все недавние поисковые запросы? Это действие не может быть отменено.</string>
+	<string name="backup_saved">Резервная копия успешно сохранена</string>
+	<string name="tracker_warning">Некоторые производители могут изменять поведение системы, нарушая работу фоновых задач.</string>
+	<string name="read_more">Подробнее</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -217,4 +217,7 @@
 	<string name="languages">Languages</string>
 	<string name="welcome">Welcome</string>
 	<string name="description">Description</string>
+	<string name="backup_saved">Backup saved successfully</string>
+	<string name="tracker_warning">Some manufacturers can change the system behavior, which may breaks background tasks.</string>
+	<string name="read_more">Read more</string>
 </resources>

app/src/main/res/xml/pref_backup.xml

@@ -16,7 +16,7 @@
 		app:iconSpaceReserved="false" />
 
 	<Preference
-		android:icon="@drawable/ic_info_outilne"
+		android:icon="@drawable/ic_info_outline"
 		android:persistent="false"
 		android:selectable="false"
 		android:summary="@string/backup_information"

app/src/main/res/xml/pref_tracker.xml

@@ -24,4 +24,12 @@
 		android:title="@string/notifications_settings"
 		app:iconSpaceReserved="false" />
 
+	<org.koitharu.kotatsu.settings.utils.LinksPreference
+		android:key="track_warning"
+		android:icon="@drawable/ic_info_outline"
+		android:persistent="false"
+		android:selectable="false"
+		android:summary="@string/tracker_warning"
+		app:allowDividerAbove="true" />
+
 </PreferenceScreen>