From 772bed90fa8776300869192fa3a9871e19433d47 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Mon, 12 Oct 2026 09:55:55 +0200
Subject: [PATCH 1/3] make password field accessible by talkback and add
 content descriptions

---
 src/keepass2android-app/PasswordActivity.cs           | 3 +++
 src/keepass2android-app/Resources/layout/password.xml | 5 +++--
 src/keepass2android-app/Resources/values/strings.xml  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/keepass2android-app/PasswordActivity.cs b/src/keepass2android-app/PasswordActivity.cs
index a4d129a32..5c314bcf4 100644
--- a/src/keepass2android-app/PasswordActivity.cs
+++ b/src/keepass2android-app/PasswordActivity.cs
@@ -1601,6 +1601,9 @@ private void MakePasswordMaskedOrVisible()
         password.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
       }
       password.SetSelection(selStart, selEnd);
+      var toggleButton = FindViewById(Resource.Id.toggle_password);
+      if (toggleButton != null)
+        toggleButton.ContentDescription = GetString(_showPassword ? Resource.String.hide_password : Resource.String.show_password);
     }
 
     protected override void OnPause()
diff --git a/src/keepass2android-app/Resources/layout/password.xml b/src/keepass2android-app/Resources/layout/password.xml
index 8a06ca267..02124d949 100644
--- a/src/keepass2android-app/Resources/layout/password.xml
+++ b/src/keepass2android-app/Resources/layout/password.xml
@@ -137,8 +137,7 @@
                                 android:inputType="textPassword"
                                 android:layout_weight="1"
                                 android:fontFamily="sans-serif"
-                                android:hint="@string/hint_login_pass"
-                              android:importantForAccessibility="no"/>
+                                android:hint="@string/hint_login_pass" />
                             <LinearLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -152,6 +151,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentBottom="true"
                                     android:src="@drawable/baseline_visibility_24"
+                                    android:contentDescription="@string/show_password"
                                     android:background="?android:selectableItemBackground" />
 
                               <ImageButton
@@ -161,6 +161,7 @@
                                     android:layout_margin="4dp"
                                     android:layout_alignParentBottom="true"
                                     android:src="@drawable/baseline_fingerprint_24"
+                                    android:contentDescription="@string/fingerprint_prefs"
                                     android:scaleType="fitXY"
                                     android:background="?android:selectableItemBackground" />
                             </LinearLayout>
diff --git a/src/keepass2android-app/Resources/values/strings.xml b/src/keepass2android-app/Resources/values/strings.xml
index 25467a0d7..003488d21 100644
--- a/src/keepass2android-app/Resources/values/strings.xml
+++ b/src/keepass2android-app/Resources/values/strings.xml
@@ -259,6 +259,7 @@
   <string name="space">Space</string>
   <string name="search_label">Search</string>
   <string name="show_password">Show password</string>
+  <string name="hide_password">Hide password</string>
   <string name="sort_menu">Sort by...</string>
   <string name="sort_name">Sort by name</string>
   <string name="sort_db">Sort by creation date</string>

From 6148d8f5444934327c48989c9294a67c499db4d3 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Mon, 12 Oct 2026 10:38:59 +0200
Subject: [PATCH 2/3] Changes to improve accessibility/talkback: remove
 importantForAccessibility=no on password fields, add content descriptions for
 more elements

---
 .../Resources/layout/ListViewPluginRow.xml    |  2 +-
 .../Resources/layout/QuickUnlock.xml          |  7 ++--
 .../Resources/layout/about.xml                |  6 +--
 .../layout/autofill_service_list_item.xml     |  2 +-
 .../Resources/layout/child_db_config_row.xml  |  3 +-
 .../Resources/layout/create_database.xml      | 10 ++---
 .../Resources/layout/donate.xml               |  2 +-
 .../Resources/layout/donate_bday.xml          |  2 +-
 .../Resources/layout/donate_bdaymissed.xml    |  2 +-
 .../Resources/layout/entry_edit.xml           | 13 +++---
 .../layout/entry_edit_section_file.xml        |  4 +-
 .../layout/entry_extrastring_value.xml        |  3 +-
 .../Resources/layout/entry_list_entry.xml     |  8 ++--
 .../Resources/layout/entry_view.xml           |  2 +-
 .../Resources/layout/entry_view_contents.xml  | 40 +++++++++----------
 .../Resources/layout/file_selection.xml       |  2 +-
 .../layout/file_selection_filename.xml        |  2 +-
 .../Resources/layout/fingerprint_setup.xml    |  2 +-
 .../Resources/layout/ftpcredentials.xml       |  3 +-
 .../Resources/layout/generate_password.xml    |  4 +-
 .../Resources/layout/group.xml                |  8 ++--
 .../Resources/layout/group_edit.xml           |  2 +-
 .../Resources/layout/group_list_entry.xml     |  8 ++--
 .../layout/image_list_preference_row.xml      |  1 +
 .../Resources/layout/megacredentials.xml      |  3 +-
 .../Resources/layout/owncloudcredentials.xml  |  3 +-
 .../Resources/layout/password.xml             |  6 +--
 .../Resources/layout/plugin_details.xml       |  2 +-
 .../Resources/layout/search.xml               |  2 +-
 .../Resources/layout/sftpcredentials.xml      |  3 +-
 .../Resources/values/strings.xml              |  3 ++
 31 files changed, 75 insertions(+), 85 deletions(-)

diff --git a/src/keepass2android-app/Resources/layout/ListViewPluginRow.xml b/src/keepass2android-app/Resources/layout/ListViewPluginRow.xml
index 159c425ca..ac5ac1a94 100644
--- a/src/keepass2android-app/Resources/layout/ListViewPluginRow.xml
+++ b/src/keepass2android-app/Resources/layout/ListViewPluginRow.xml
@@ -10,7 +10,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="15dp"
         android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp" />
+        android:layout_marginBottom="5dp" android:importantForAccessibility="no"/>
     <TextView
         android:id="@+id/txtLabel"
         android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/QuickUnlock.xml b/src/keepass2android-app/Resources/layout/QuickUnlock.xml
index e00ce971c..0f38d68ab 100644
--- a/src/keepass2android-app/Resources/layout/QuickUnlock.xml
+++ b/src/keepass2android-app/Resources/layout/QuickUnlock.xml
@@ -42,7 +42,7 @@ android:fitsSystemWindows="false">
               android:layout_height="match_parent"
               android:scaleType="centerCrop"
               android:src="@drawable/toolbar_bg_quickunlock"
-              app:layout_collapseMode="parallax" />
+              app:layout_collapseMode="parallax" android:importantForAccessibility="no"/>
           <TextView
               android:id="@+id/filename_label"
               android:layout_width="wrap_content"
@@ -111,8 +111,7 @@ android:paddingRight="16dp"
             android:fontFamily="sans-serif"
             android:textSize="20sp"
             android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:importantForAccessibility="no"/>
+            android:focusableInTouchMode="true" />
 
           <ImageButton
                                     android:id="@+id/fingerprintbtn"
@@ -122,7 +121,7 @@ android:paddingRight="16dp"
                                     android:layout_alignParentBottom="true"
                                     android:src="@drawable/baseline_fingerprint_24"
                                     android:scaleType="fitXY"
-                                    android:background="?android:selectableItemBackground" />
+                                    android:background="?android:selectableItemBackground" android:contentDescription="@string/fingerprint_prefs"/>
 
           </LinearLayout>
 
diff --git a/src/keepass2android-app/Resources/layout/about.xml b/src/keepass2android-app/Resources/layout/about.xml
index f529841f7..815797b8e 100644
--- a/src/keepass2android-app/Resources/layout/about.xml
+++ b/src/keepass2android-app/Resources/layout/about.xml
@@ -22,7 +22,7 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/about_title"
 			android:scaleType="fitXY"
-			android:src="@android:drawable/divider_horizontal_dark" />
+			android:src="@android:drawable/divider_horizontal_dark" android:importantForAccessibility="no"/>
 		<TextView
 					android:id="@+id/version_title"
 					android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/versionB"
 			android:scaleType="fitXY"
-			android:src="@android:drawable/divider_horizontal_dark" />
+			android:src="@android:drawable/divider_horizontal_dark" android:importantForAccessibility="no"/>
 
 		<TextView
 			android:id="@+id/feedback_title"
@@ -95,7 +95,7 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/translate"
 			android:scaleType="fitXY"
-			android:src="@android:drawable/divider_horizontal_dark" />
+			android:src="@android:drawable/divider_horizontal_dark" android:importantForAccessibility="no"/>
 		<TextView
 			android:id="@+id/disclaimer_title"
 			style="@style/InfoHeader"
diff --git a/src/keepass2android-app/Resources/layout/autofill_service_list_item.xml b/src/keepass2android-app/Resources/layout/autofill_service_list_item.xml
index 44c1cd747..fcf7e213a 100644
--- a/src/keepass2android-app/Resources/layout/autofill_service_list_item.xml
+++ b/src/keepass2android-app/Resources/layout/autofill_service_list_item.xml
@@ -42,5 +42,5 @@
         android:adjustViewBounds="true"
         
         android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
-        android:src="@drawable/ic_launcher" />
+        android:src="@drawable/ic_launcher" android:importantForAccessibility="no"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/child_db_config_row.xml b/src/keepass2android-app/Resources/layout/child_db_config_row.xml
index 2e2ad24cc..9530ce5ca 100644
--- a/src/keepass2android-app/Resources/layout/child_db_config_row.xml
+++ b/src/keepass2android-app/Resources/layout/child_db_config_row.xml
@@ -22,8 +22,7 @@
           android:layout_centerVertical="true"
           
           android:paddingBottom="4sp"
-          android:paddingTop="4sp"
-         />
+          android:paddingTop="4sp" android:importantForAccessibility="no"/>
 
       <TextView
           android:id="@+id/child_db_title"
diff --git a/src/keepass2android-app/Resources/layout/create_database.xml b/src/keepass2android-app/Resources/layout/create_database.xml
index e97b30ad3..193393dfb 100644
--- a/src/keepass2android-app/Resources/layout/create_database.xml
+++ b/src/keepass2android-app/Resources/layout/create_database.xml
@@ -35,9 +35,7 @@ android:layout_height="wrap_content">
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:src="@drawable/ic_storage_file"
-				android:padding="5dp"
-					
-				/>
+				android:padding="5dp" android:importantForAccessibility="no"/>
 
 			<TextView
 		android:id="@+id/filestorage_label"
@@ -115,8 +113,7 @@ android:layout_height="wrap_content">
 			android:hint="@string/hint_pass"
 			android:inputType="textPassword"
 			android:singleLine="true"
-			android:typeface="monospace" 
-		  android:importantForAccessibility="no" />
+			android:typeface="monospace" />
 		<!-- Confirm Password -->
 		<EditText
 			android:id="@+id/entry_confpassword"
@@ -127,8 +124,7 @@ android:layout_height="wrap_content">
 			android:hint="@string/hint_conf_pass"
 			android:inputType="textPassword"
 			android:singleLine="true"
-			android:typeface="monospace"
-		  android:importantForAccessibility="no"/>
+			android:typeface="monospace" />
 
 		</RelativeLayout>
 
diff --git a/src/keepass2android-app/Resources/layout/donate.xml b/src/keepass2android-app/Resources/layout/donate.xml
index 78d29fac2..51342c48f 100644
--- a/src/keepass2android-app/Resources/layout/donate.xml
+++ b/src/keepass2android-app/Resources/layout/donate.xml
@@ -24,7 +24,7 @@
 			android:layout_below="@id/donate_question"
 			android:adjustViewBounds="true"
 			android:scaleType="fitCenter"
-			android:src="@drawable/oktoberfest" />
+			android:src="@drawable/oktoberfest" android:importantForAccessibility="no"/>
 		<Button 
 			 android:text="@string/ok_donate"
         android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/donate_bday.xml b/src/keepass2android-app/Resources/layout/donate_bday.xml
index 5720d4419..0e60094e6 100644
--- a/src/keepass2android-app/Resources/layout/donate_bday.xml
+++ b/src/keepass2android-app/Resources/layout/donate_bday.xml
@@ -24,7 +24,7 @@
 			android:layout_below="@id/donate_question"
 			android:adjustViewBounds="true"
 			android:scaleType="fitCenter"
-			android:src="@drawable/donate_cake" />
+			android:src="@drawable/donate_cake" android:importantForAccessibility="no"/>
 		<Button 
 			 android:text="@string/ok_donate"
         android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/donate_bdaymissed.xml b/src/keepass2android-app/Resources/layout/donate_bdaymissed.xml
index b0808dc08..84ffd416d 100644
--- a/src/keepass2android-app/Resources/layout/donate_bdaymissed.xml
+++ b/src/keepass2android-app/Resources/layout/donate_bdaymissed.xml
@@ -24,7 +24,7 @@
 			android:layout_below="@id/donate_question"
 			android:adjustViewBounds="true"
 			android:scaleType="fitCenter"
-			android:src="@drawable/donate_cake" />
+			android:src="@drawable/donate_cake" android:importantForAccessibility="no"/>
 		<Button 
 			 android:text="@string/ok_donate"
         android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/entry_edit.xml b/src/keepass2android-app/Resources/layout/entry_edit.xml
index 2f8ba8eef..ffdb54bf0 100644
--- a/src/keepass2android-app/Resources/layout/entry_edit.xml
+++ b/src/keepass2android-app/Resources/layout/entry_edit.xml
@@ -29,7 +29,7 @@
                 android:layout_margin="2dp"
                 android:scaleType="fitCenter"
                 android:layout_alignParentRight="true"
-                android:src="@drawable/ic00" />
+                android:src="@drawable/ic00" android:contentDescription="@string/select_icon"/>
             <!--
             <item name="android:layout_width">fill_parent</item>
             <item name="android:layout_height">wrap_content</item>
@@ -89,8 +89,7 @@
                             android:layout_height="wrap_content"
                             android:singleLine="true"
                             android:inputType="textPassword"
-                            android:hint="@string/hint_pass"
-                          android:importantForAccessibility="no"/>
+                            android:hint="@string/hint_pass" />
                     </com.google.android.material.textfield.TextInputLayout>
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -147,7 +146,7 @@
             style="@style/EntryEditSingleLine_container">
             <ImageView
                 style="@style/EntryEditSingleLine_ImageView"
-                android:src="@drawable/baseline_more_horiz_24" />
+                android:src="@drawable/baseline_more_horiz_24" android:importantForAccessibility="no"/>
           <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -186,7 +185,7 @@
             style="@style/EntryEditSingleLine_container">
             <ImageView
                 style="@style/EntryEditSingleLine_ImageView"
-                android:src="@drawable/baseline_attachment_24" />
+                android:src="@drawable/baseline_attachment_24" android:importantForAccessibility="no"/>
             <LinearLayout
                 android:layout_height="wrap_content"
                 android:layout_width="fill_parent"
@@ -242,7 +241,7 @@
             style="@style/EntryEditSingleLine_container">
             <ImageView
                 style="@style/EntryEditSingleLine_ImageView"
-                android:src="@drawable/baseline_explicit_24" />
+                android:src="@drawable/baseline_explicit_24" android:importantForAccessibility="no"/>
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -262,7 +261,7 @@
                         android:id="@+id/entry_expires_checkbox"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
+                        android:layout_gravity="center_vertical" android:contentDescription="@string/entry_expires"/>
                     <EditText
                         android:id="@+id/entry_expires"
                         android:layout_marginLeft="-4dip"
diff --git a/src/keepass2android-app/Resources/layout/entry_edit_section_file.xml b/src/keepass2android-app/Resources/layout/entry_edit_section_file.xml
index 062d84fac..27ad9c6e4 100644
--- a/src/keepass2android-app/Resources/layout/entry_edit_section_file.xml
+++ b/src/keepass2android-app/Resources/layout/entry_edit_section_file.xml
@@ -39,9 +39,7 @@ android:layout_height="wrap_content">
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:src="@drawable/ic_storage_file"
-				android:padding="5dp"
-					
-				/>
+				android:padding="5dp" android:importantForAccessibility="no"/>
 
 			<TextView
 		android:id="@+id/filestorage_label"
diff --git a/src/keepass2android-app/Resources/layout/entry_extrastring_value.xml b/src/keepass2android-app/Resources/layout/entry_extrastring_value.xml
index d9a653800..3e2683dc7 100644
--- a/src/keepass2android-app/Resources/layout/entry_extrastring_value.xml
+++ b/src/keepass2android-app/Resources/layout/entry_extrastring_value.xml
@@ -13,8 +13,7 @@
 		android:layout_height="15dp"
 			   android:src="@drawable/baseline_more_vert_24"
 			   android:gravity="right|bottom"
-			   android:layout_alignParentRight="true"
-				   />
+			   android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
 	<TextView
 		android:id="@+id/entry_extra"
 		android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/entry_list_entry.xml b/src/keepass2android-app/Resources/layout/entry_list_entry.xml
index 3cb157cc3..6f2f0e59d 100644
--- a/src/keepass2android-app/Resources/layout/entry_list_entry.xml
+++ b/src/keepass2android-app/Resources/layout/entry_list_entry.xml
@@ -17,19 +17,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
-         android:src="@drawable/entry_icon_bkg_drawable"/>
+         android:src="@drawable/entry_icon_bkg_drawable" android:importantForAccessibility="no"/>
 
     <ImageView android:id="@+id/icon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:padding="5dp"
-        android:src="@drawable/ic_storage_content"/>
+        android:src="@drawable/ic_storage_content" android:importantForAccessibility="no"/>
 
     <ImageView android:id="@+id/check_mark"
           android:layout_width="40dp"
           android:layout_height="40dp"
           android:padding="5dp"
-          android:src="@drawable/baseline_check_24"/>
+          android:src="@drawable/baseline_check_24" android:contentDescription="@string/selected"/>
 
   </RelativeLayout>
   <LinearLayout
@@ -91,7 +91,7 @@
         android:layout_alignParentRight="true"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
-        android:src="@drawable/baseline_keyboard_arrow_right_24"/>
+        android:src="@drawable/baseline_keyboard_arrow_right_24" android:importantForAccessibility="no"/>
 
 
 
diff --git a/src/keepass2android-app/Resources/layout/entry_view.xml b/src/keepass2android-app/Resources/layout/entry_view.xml
index 2fef6269a..53da7daad 100644
--- a/src/keepass2android-app/Resources/layout/entry_view.xml
+++ b/src/keepass2android-app/Resources/layout/entry_view.xml
@@ -39,5 +39,5 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom|right"
         android:layout_margin="16dp"
-        android:src="@drawable/baseline_edit_24" />
+        android:src="@drawable/baseline_edit_24" android:contentDescription="@string/menu_edit"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/entry_view_contents.xml b/src/keepass2android-app/Resources/layout/entry_view_contents.xml
index c41b56197..82112ab65 100644
--- a/src/keepass2android-app/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android-app/Resources/layout/entry_view_contents.xml
@@ -14,7 +14,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_folder_open_24" />
+        android:src="@drawable/baseline_folder_open_24" android:importantForAccessibility="no"/>
     <LinearLayout
 
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
           android:tint="@color/md_theme_primary"
           android:src="@drawable/baseline_more_vert_24"
           android:gravity="right|bottom"
-          android:layout_alignParentRight="true" />
+          android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
 
         <TextView
             android:id="@+id/entry_group_name"
@@ -59,7 +59,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_account_circle_24" />
+        android:src="@drawable/baseline_account_circle_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -88,7 +88,7 @@
             android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
         <TextView
             android:id="@+id/entry_user_name"
             android:layout_width="fill_parent"
@@ -105,7 +105,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_link_24" />
+        android:src="@drawable/baseline_link_24" android:importantForAccessibility="no"/>
     <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
@@ -132,7 +132,7 @@
             android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
         <TextView
             android:id="@+id/entry_url"
             android:layout_width="fill_parent"
@@ -148,7 +148,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_password_24" />
+        android:src="@drawable/baseline_password_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -177,7 +177,7 @@
             android:tint="@color/md_theme_primary"
             android:src="@drawable/baseline_more_vert_24"
             android:gravity="right|bottom"
-            android:layout_alignParentRight="true" />
+            android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
         <TextView
             android:id="@+id/entry_password"
             android:layout_width="fill_parent"
@@ -200,7 +200,7 @@
     style="@style/EntryEditSingleLine_container">
     <ImageView
       style="@style/EntryEditSingleLine_ImageView"
-      android:src="@drawable/baseline_access_time_24" />
+      android:src="@drawable/baseline_access_time_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -229,7 +229,7 @@
           android:tint="@color/md_theme_primary"
           android:src="@drawable/baseline_more_vert_24"
           android:gravity="right|bottom"
-          android:layout_alignParentRight="true" />
+          android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
         <TextView
           android:id="@+id/entry_totp"
           android:layout_width="fill_parent"
@@ -264,7 +264,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_comment_24" />
+        android:src="@drawable/baseline_comment_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -293,7 +293,7 @@
                   android:tint="@color/md_theme_primary"
                   android:src="@drawable/baseline_more_vert_24"
                   android:gravity="right|bottom"
-                  android:layout_alignParentRight="true" />
+                  android:layout_alignParentRight="true" android:importantForAccessibility="no"/>
         <TextView
                   android:id="@+id/entry_comment"
                   android:layout_width="fill_parent"
@@ -309,7 +309,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_more_horiz_24" />
+        android:src="@drawable/baseline_more_horiz_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         android:id="@+id/extra_strings"    
@@ -324,7 +324,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_attachment_24" />
+        android:src="@drawable/baseline_attachment_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         android:layout_height="wrap_content"
@@ -351,7 +351,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_label_24" />
+        android:src="@drawable/baseline_label_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
       
@@ -377,7 +377,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_link_24" />
+        android:src="@drawable/baseline_link_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -405,7 +405,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_date_range_24" />
+        android:src="@drawable/baseline_date_range_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -432,7 +432,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_explicit_24" />
+        android:src="@drawable/baseline_explicit_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -460,7 +460,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_edit_calendar_24" />
+        android:src="@drawable/baseline_edit_calendar_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         
@@ -507,7 +507,7 @@
             style="@style/EntryEditSingleLine_container">
     <ImageView
         style="@style/EntryEditSingleLine_ImageView"
-        android:src="@drawable/baseline_history_24" />
+        android:src="@drawable/baseline_history_24" android:importantForAccessibility="no"/>
 
     <LinearLayout
         android:layout_height="wrap_content"
diff --git a/src/keepass2android-app/Resources/layout/file_selection.xml b/src/keepass2android-app/Resources/layout/file_selection.xml
index a0bef7297..4ba089488 100644
--- a/src/keepass2android-app/Resources/layout/file_selection.xml
+++ b/src/keepass2android-app/Resources/layout/file_selection.xml
@@ -35,7 +35,7 @@
                     android:layout_weight="0"
                     android:scaleType="centerCrop"
                     android:layout_marginTop="@dimen/splash_logo_marginTop"
-                    android:src="@drawable/splashlogo" />
+                    android:src="@drawable/splashlogo" android:importantForAccessibility="no"/>
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/src/keepass2android-app/Resources/layout/file_selection_filename.xml b/src/keepass2android-app/Resources/layout/file_selection_filename.xml
index e5799595b..92aae6f3e 100644
--- a/src/keepass2android-app/Resources/layout/file_selection_filename.xml
+++ b/src/keepass2android-app/Resources/layout/file_selection_filename.xml
@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:src="@drawable/baseline_folder_24"
             android:layout_alignParentRight="true"
-            android:layout_below="@id/label_open_by_filename" />
+            android:layout_below="@id/label_open_by_filename" android:contentDescription="@string/browse"/>
         <EditText
             android:id="@+id/file_filename"
             android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/fingerprint_setup.xml b/src/keepass2android-app/Resources/layout/fingerprint_setup.xml
index 9118a6865..09d866b2c 100644
--- a/src/keepass2android-app/Resources/layout/fingerprint_setup.xml
+++ b/src/keepass2android-app/Resources/layout/fingerprint_setup.xml
@@ -104,7 +104,7 @@
             android:layout_alignParentStart="true"
             android:layout_below="@+id/fingerprint_description"
             android:layout_marginTop="20dp"
-            android:src="@drawable/baseline_fingerprint_24" />
+            android:src="@drawable/baseline_fingerprint_24" android:importantForAccessibility="no"/>
         <TextView
             android:id="@+id/fingerprint_status"
             style="@style/TextAppearance.AppCompat.Body1"
diff --git a/src/keepass2android-app/Resources/layout/ftpcredentials.xml b/src/keepass2android-app/Resources/layout/ftpcredentials.xml
index 5fe09ba7f..c36c3f150 100644
--- a/src/keepass2android-app/Resources/layout/ftpcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/ftpcredentials.xml
@@ -59,8 +59,7 @@
             android:inputType="textPassword"
             android:text=""
             android:singleLine="true"
-            android:hint="@string/hint_pass" 
-            android:importantForAccessibility="no"/>
+            android:hint="@string/hint_pass" />
 
   <TextView android:id="@+id/initial_dir"
           android:layout_width="wrap_content"
diff --git a/src/keepass2android-app/Resources/layout/generate_password.xml b/src/keepass2android-app/Resources/layout/generate_password.xml
index 351c7bd7d..de3800d72 100644
--- a/src/keepass2android-app/Resources/layout/generate_password.xml
+++ b/src/keepass2android-app/Resources/layout/generate_password.xml
@@ -108,7 +108,7 @@
           android:scaleType="fitCenter"
           android:src="@drawable/baseline_save_24"
           android:layout_alignParentRight="true"
-          android:layout_alignParentTop="true" />
+          android:layout_alignParentTop="true" android:contentDescription="@string/entry_save"/>
 
         <ImageButton
           android:id="@+id/btn_password_generator_profile_delete"
@@ -117,7 +117,7 @@
           android:scaleType="fitCenter"
           android:src="@drawable/baseline_close_24"
           android:layout_alignParentRight="true"
-          android:layout_alignParentTop="true" />
+          android:layout_alignParentTop="true" android:contentDescription="@string/menu_delete"/>
         
             
         </LinearLayout>
diff --git a/src/keepass2android-app/Resources/layout/group.xml b/src/keepass2android-app/Resources/layout/group.xml
index 6408d4b58..aca85ba85 100644
--- a/src/keepass2android-app/Resources/layout/group.xml
+++ b/src/keepass2android-app/Resources/layout/group.xml
@@ -383,14 +383,14 @@
             android:layout_margin="16dp"
             android:layout_gravity="end|bottom|right"
             android:visibility="gone"
-            android:src="@drawable/baseline_close_24" />
+            android:src="@drawable/baseline_close_24" android:contentDescription="@string/cancel"/>
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabAddNew"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|bottom|right"
             android:layout_margin="16dp"
-            android:src="@drawable/baseline_add_24" />
+            android:src="@drawable/baseline_add_24" android:contentDescription="@string/menu_create"/>
         <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
             android:id="@+id/fabAddNewGroup"
             android:layout_width="wrap_content"
@@ -421,7 +421,7 @@
           android:src="@drawable/baseline_search_24"
           android:layout_marginRight="16dp"
           android:layout_marginBottom="88dp"
-          android:visibility="gone"/>
+          android:visibility="gone" android:contentDescription="@string/menu_search"/>
         <com.google.android.material.floatingactionbutton.FloatingActionButton
           android:id="@+id/fabTotpOverview"
           android:layout_width="wrap_content"
@@ -430,6 +430,6 @@
           android:src="@drawable/baseline_access_time_24"
           android:layout_marginRight="16dp"
           android:layout_marginBottom="160dp"
-          android:visibility="gone"/>
+          android:visibility="gone" android:contentDescription="@string/TOTP"/>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android-app/Resources/layout/group_edit.xml b/src/keepass2android-app/Resources/layout/group_edit.xml
index 8c004ee50..37ea0be96 100644
--- a/src/keepass2android-app/Resources/layout/group_edit.xml
+++ b/src/keepass2android-app/Resources/layout/group_edit.xml
@@ -11,7 +11,7 @@
         android:scaleType="fitCenter"
         android:src="@drawable/ic00"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true" />
+        android:layout_alignParentTop="true" android:contentDescription="@string/select_icon"/>
     <EditText
         android:id="@+id/group_name"
         android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/group_list_entry.xml b/src/keepass2android-app/Resources/layout/group_list_entry.xml
index ec120b4b0..99cdd6100 100644
--- a/src/keepass2android-app/Resources/layout/group_list_entry.xml
+++ b/src/keepass2android-app/Resources/layout/group_list_entry.xml
@@ -15,19 +15,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="fitXY"
-         android:src="@drawable/group_icon_bkg_drawable"/>
+         android:src="@drawable/group_icon_bkg_drawable" android:importantForAccessibility="no"/>
 
     <ImageView android:id="@+id/icon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:padding="5dp"
-        android:src="@drawable/ic_storage_content"/>
+        android:src="@drawable/ic_storage_content" android:importantForAccessibility="no"/>
     
   <ImageView android:id="@+id/check_mark"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:padding="5dp"
-        android:src="@drawable/baseline_check_24"/>
+        android:src="@drawable/baseline_check_24" android:contentDescription="@string/selected"/>
 
   </RelativeLayout>
   <LinearLayout
@@ -59,7 +59,7 @@
         android:layout_alignParentRight="true"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
-        android:src="@drawable/baseline_keyboard_arrow_right_24"/>
+        android:src="@drawable/baseline_keyboard_arrow_right_24" android:importantForAccessibility="no"/>
 
 
 
diff --git a/src/keepass2android-app/Resources/layout/image_list_preference_row.xml b/src/keepass2android-app/Resources/layout/image_list_preference_row.xml
index 29125e260..42fe82fb4 100644
--- a/src/keepass2android-app/Resources/layout/image_list_preference_row.xml
+++ b/src/keepass2android-app/Resources/layout/image_list_preference_row.xml
@@ -9,6 +9,7 @@
     android:paddingRight="?android:attr/scrollbarSize" >
     <TextView
         android:id="@+id/image_list_view_row_text_view"
+        android:labelFor="@+id/image_list_view_row_radio_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
diff --git a/src/keepass2android-app/Resources/layout/megacredentials.xml b/src/keepass2android-app/Resources/layout/megacredentials.xml
index 5e31a14e2..b067544dd 100644
--- a/src/keepass2android-app/Resources/layout/megacredentials.xml
+++ b/src/keepass2android-app/Resources/layout/megacredentials.xml
@@ -26,8 +26,7 @@
             android:inputType="textPassword"
             android:text=""
             android:singleLine="true"
-            android:hint="@string/hint_pass" 
-            android:importantForAccessibility="no"/>
+            android:hint="@string/hint_pass" />
 
 
 </LinearLayout>
diff --git a/src/keepass2android-app/Resources/layout/owncloudcredentials.xml b/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
index 9d51a79a2..b962b5590 100644
--- a/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/owncloudcredentials.xml
@@ -40,8 +40,7 @@
             android:inputType="textPassword"
             android:singleLine="true"
             android:text=""
-            android:hint="@string/hint_pass" 
-    android:importantForAccessibility="no"/>
+            android:hint="@string/hint_pass" />
 
 
 
diff --git a/src/keepass2android-app/Resources/layout/password.xml b/src/keepass2android-app/Resources/layout/password.xml
index 02124d949..6ec952ad9 100644
--- a/src/keepass2android-app/Resources/layout/password.xml
+++ b/src/keepass2android-app/Resources/layout/password.xml
@@ -49,7 +49,7 @@
                   android:layout_height="match_parent"
                   android:scaleType="centerCrop"
                   android:src="@drawable/toolbar_bg"
-                  app:layout_collapseMode="parallax" />
+                  app:layout_collapseMode="parallax" android:importantForAccessibility="no"/>
                 <HorizontalScrollView
                   android:layout_alignParentBottom="true"
                             
@@ -188,7 +188,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:src="@drawable/ic_storage_file"
-                                android:padding="5dp" />
+                                android:padding="5dp" android:importantForAccessibility="no"/>
                             <TextView
                                 android:id="@+id/filestorage_label"
                                 android:layout_width="wrap_content"
@@ -439,7 +439,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/navheader_bg" />
+                    android:src="@drawable/navheader_bg" android:importantForAccessibility="no"/>
               <TextView
                 android:id="@+id/nav_app_name"
                     android:layout_width="wrap_content"
diff --git a/src/keepass2android-app/Resources/layout/plugin_details.xml b/src/keepass2android-app/Resources/layout/plugin_details.xml
index e65cfb3d9..26ec8546a 100644
--- a/src/keepass2android-app/Resources/layout/plugin_details.xml
+++ b/src/keepass2android-app/Resources/layout/plugin_details.xml
@@ -99,7 +99,7 @@
 					android:layout_alignParentTop="true"
 					android:layout_marginRight="15dp"
 					android:layout_marginTop="5dp"
-					android:layout_marginBottom="5dp" />
+					android:layout_marginBottom="5dp" android:importantForAccessibility="no"/>
 				<TextView
 					android:id="@+id/txtLabel"
 					android:layout_width="fill_parent"
diff --git a/src/keepass2android-app/Resources/layout/search.xml b/src/keepass2android-app/Resources/layout/search.xml
index 81b233441..031eb6b81 100644
--- a/src/keepass2android-app/Resources/layout/search.xml
+++ b/src/keepass2android-app/Resources/layout/search.xml
@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:src="@drawable/baseline_search_24"
         android:layout_below="@id/search_label"
-        android:layout_alignParentRight="true" />
+        android:layout_alignParentRight="true" android:contentDescription="@string/menu_search"/>
     <EditText
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/src/keepass2android-app/Resources/layout/sftpcredentials.xml b/src/keepass2android-app/Resources/layout/sftpcredentials.xml
index d35edbfeb..88158b816 100644
--- a/src/keepass2android-app/Resources/layout/sftpcredentials.xml
+++ b/src/keepass2android-app/Resources/layout/sftpcredentials.xml
@@ -69,8 +69,7 @@
         android:layout_height="wrap_content"
         android:inputType="textPassword"
         android:singleLine="true"
-        android:hint="@string/hint_pass"
-	    android:importantForAccessibility="no"/>
+        android:hint="@string/hint_pass" />
 
     <Button
         android:id="@+id/send_public_key_button"
diff --git a/src/keepass2android-app/Resources/values/strings.xml b/src/keepass2android-app/Resources/values/strings.xml
index 003488d21..7f5ff5c76 100644
--- a/src/keepass2android-app/Resources/values/strings.xml
+++ b/src/keepass2android-app/Resources/values/strings.xml
@@ -260,6 +260,9 @@
   <string name="search_label">Search</string>
   <string name="show_password">Show password</string>
   <string name="hide_password">Hide password</string>
+  <string name="browse">Browse</string>
+  <string name="select_icon">Select icon</string>
+  <string name="selected">Selected</string>
   <string name="sort_menu">Sort by...</string>
   <string name="sort_name">Sort by name</string>
   <string name="sort_db">Sort by creation date</string>

From 842cca65b36dc2dd32bec7586d65bf8ae99e38d3 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Mon, 12 Oct 2026 10:51:50 +0200
Subject: [PATCH 3/3] make password field in Entry View accessible

---
 src/keepass2android-app/EntryActivity.cs             | 2 ++
 src/keepass2android-app/Resources/values/strings.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/keepass2android-app/EntryActivity.cs b/src/keepass2android-app/EntryActivity.cs
index 27b70e47a..bd9a3b293 100644
--- a/src/keepass2android-app/EntryActivity.cs
+++ b/src/keepass2android-app/EntryActivity.cs
@@ -1470,6 +1470,8 @@ private void SetPasswordStyle(ProtectedTextviewGroup group)
       SetPasswordTypeface(group.VisibleProtectedField);
 
       group.ProtectedField.InputType = InputTypes.ClassText | InputTypes.TextVariationPassword;
+      // masked text is not spoken by screen readers: announce the length instead of the content
+      group.ProtectedField.ContentDescription = GetString(Resource.String.hidden_protected_field, group.ProtectedField.Text?.Length ?? 0);
     }
 
     protected override void OnResume()
diff --git a/src/keepass2android-app/Resources/values/strings.xml b/src/keepass2android-app/Resources/values/strings.xml
index 7f5ff5c76..3f90d42e6 100644
--- a/src/keepass2android-app/Resources/values/strings.xml
+++ b/src/keepass2android-app/Resources/values/strings.xml
@@ -260,6 +260,7 @@
   <string name="search_label">Search</string>
   <string name="show_password">Show password</string>
   <string name="hide_password">Hide password</string>
+  <string name="hidden_protected_field">Hidden, %1$d characters</string>
   <string name="browse">Browse</string>
   <string name="select_icon">Select icon</string>
   <string name="selected">Selected</string>