Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/keepass2android-app/EntryActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 3 additions & 0 deletions src/keepass2android-app/PasswordActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 3 additions & 4 deletions src/keepass2android-app/Resources/layout/QuickUnlock.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions src/keepass2android-app/Resources/layout/about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 3 additions & 7 deletions src/keepass2android-app/Resources/layout/create_database.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/keepass2android-app/Resources/layout/donate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/keepass2android-app/Resources/layout/donate_bday.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 6 additions & 7 deletions src/keepass2android-app/Resources/layout/entry_edit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/keepass2android-app/Resources/layout/entry_list_entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"/>



Expand Down
2 changes: 1 addition & 1 deletion src/keepass2android-app/Resources/layout/entry_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading
Loading