From a1964ff99044333ed2bad015af08a281169f4860 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 6 Mar 2022 14:16:43 +0100 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/FragmentOptions.java | 2 +- .../res/layout/fragment_options_connection.xml | 8 ++++---- .../res/layout/fragment_options_encryption.xml | 2 +- app/src/main/res/layout/fragment_options_misc.xml | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index 7f813459f3..4b4645b4cc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -417,7 +417,7 @@ public class FragmentOptions extends FragmentBase { } private int getSuggestions(String query, int id, int tab, String title, View view, MatrixCursor cursor) { - if (view == null || "debug".equals(view.getTag())) + if (view == null || "nosuggest".equals(view.getTag())) return id; else if (view instanceof ViewGroup) { ViewGroup group = (ViewGroup) view; diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml index 6fc5bf7109..0f0706d8e4 100644 --- a/app/src/main/res/layout/fragment_options_connection.xml +++ b/app/src/main/res/layout/fragment_options_connection.xml @@ -359,7 +359,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_bind_socket" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -371,7 +371,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_standalone_vpn" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -383,7 +383,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_tcp_keep_alive" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -500,7 +500,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="3dp" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" app:cardBackgroundColor="?attr/colorCardBackground" app:cardCornerRadius="6dp" app:cardElevation="0dp" diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml index 02a29fd0af..686f4148eb 100644 --- a/app/src/main/res/layout/fragment_options_encryption.xml +++ b/app/src/main/res/layout/fragment_options_encryption.xml @@ -409,7 +409,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="3dp" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" app:cardBackgroundColor="?attr/colorCardBackground" app:cardCornerRadius="6dp" app:cardElevation="0dp" diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index ec831e7966..1176588a9f 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_external_answer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -561,7 +561,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_test1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -573,7 +573,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_test2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -585,7 +585,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_test3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -597,7 +597,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_test4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -609,7 +609,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" android:text="@string/title_advanced_test5" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -636,7 +636,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="3dp" android:layout_marginTop="12dp" - android:tag="debug" + android:tag="nosuggest" app:cardBackgroundColor="?attr/colorCardBackground" app:cardCornerRadius="6dp" app:cardElevation="0dp"