From bac2e40eb261c0bac5ace0c905d5ea118fd107be Mon Sep 17 00:00:00 2001 From: mihai-adrian Date: Fri, 2 Aug 2019 10:42:06 +0300 Subject: [PATCH] fixes #4435 - changed title of menuitem for delete and added content description setting menu title should also set content description. I added the setContentDescription programmatically in order to ensure that the content description is being set. If content description matches title it won't be read twice --- .../fenix/library/bookmarks/edit/EditBookmarkFragment.kt | 8 ++++++-- app/src/main/res/menu/bookmarks_edit.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt index 37186d98a..405fbf6fe 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt @@ -20,6 +20,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.navigation.Navigation +import androidx.core.view.MenuItemCompat.setContentDescription import com.jakewharton.rxbinding3.widget.textChanges import com.uber.autodispose.AutoDispose import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider @@ -146,8 +147,11 @@ class EditBookmarkFragment : Fragment() { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { inflater.inflate(R.menu.bookmarks_edit, menu) - menu.findItem(R.id.delete_bookmark_button).icon.colorFilter = - PorterDuffColorFilter(context!!.getColorFromAttr(R.attr.primaryText), SRC_IN) + menu.findItem(R.id.delete_bookmark_button).apply { + icon.colorFilter = + PorterDuffColorFilter(context!!.getColorFromAttr(R.attr.primaryText), SRC_IN) + setContentDescription(this, getString(R.string.bookmark_menu_delete_button)) + } } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/res/menu/bookmarks_edit.xml b/app/src/main/res/menu/bookmarks_edit.xml index d34804c87..138117920 100644 --- a/app/src/main/res/menu/bookmarks_edit.xml +++ b/app/src/main/res/menu/bookmarks_edit.xml @@ -9,7 +9,7 @@ android:id="@+id/delete_bookmark_button" android:icon="@drawable/ic_delete" android:iconTint="?primaryText" - android:title="@string/bookmark_edit" + android:title="@string/bookmark_menu_delete_button" app:showAsAction="ifRoom" tools:targetApi="o" />