mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 09:39:25 +03:00
Merge pull request #2847 from nextcloud/talkbackFixes
Improve TalkBack screenreader support
This commit is contained in:
commit
1d2e4fb070
11 changed files with 29 additions and 24 deletions
|
@ -472,10 +472,13 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
|
||||||
|
|
||||||
if (file.isSharedWithSharee() || file.isSharedWithMe()) {
|
if (file.isSharedWithSharee() || file.isSharedWithMe()) {
|
||||||
sharedIconView.setImageResource(R.drawable.shared_via_users);
|
sharedIconView.setImageResource(R.drawable.shared_via_users);
|
||||||
|
sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared));
|
||||||
} else if (file.isSharedViaLink()) {
|
} else if (file.isSharedViaLink()) {
|
||||||
sharedIconView.setImageResource(R.drawable.shared_via_link);
|
sharedIconView.setImageResource(R.drawable.shared_via_link);
|
||||||
|
sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_shared_via_link));
|
||||||
} else {
|
} else {
|
||||||
sharedIconView.setImageResource(R.drawable.ic_unshared);
|
sharedIconView.setImageResource(R.drawable.ic_unshared);
|
||||||
|
sharedIconView.setContentDescription(mContext.getString(R.string.shared_icon_share));
|
||||||
}
|
}
|
||||||
sharedIconView.setOnClickListener(new View.OnClickListener() {
|
sharedIconView.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -35,7 +35,8 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/standard_eigth_padding"
|
android:padding="@dimen/standard_eigth_padding"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
android:src="@drawable/folder" />
|
android:src="@drawable/folder"
|
||||||
|
android:contentDescription="@null"/>
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -55,7 +56,7 @@
|
||||||
android:layout_marginEnd="@dimen/standard_quarter_margin"
|
android:layout_marginEnd="@dimen/standard_quarter_margin"
|
||||||
android:layout_marginRight="@dimen/standard_quarter_margin"
|
android:layout_marginRight="@dimen/standard_quarter_margin"
|
||||||
android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
|
android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
|
||||||
android:contentDescription="@string/shared_via_link_icon"
|
android:contentDescription="@string/shared_icon_shared_via_link"
|
||||||
android:src="@drawable/shared_via_link" />
|
android:src="@drawable/shared_via_link" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
android:layout_height="@dimen/standard_list_item_size"
|
android:layout_height="@dimen/standard_list_item_size"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:src="@drawable/folder"
|
android:src="@drawable/folder"
|
||||||
android:contentDescription="@string/thumbnail"/>
|
android:contentDescription="@null"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/favorite_action"
|
android:id="@+id/favorite_action"
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
android:layout_marginRight="@dimen/standard_quarter_margin"
|
android:layout_marginRight="@dimen/standard_quarter_margin"
|
||||||
android:layout_marginEnd="@dimen/standard_quarter_margin"
|
android:layout_marginEnd="@dimen/standard_quarter_margin"
|
||||||
android:src="@drawable/shared_via_link"
|
android:src="@drawable/shared_via_link"
|
||||||
android:contentDescription="@string/shared_via_link_icon"/>
|
android:contentDescription="@string/shared_icon_shared_via_link"/>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/localFileIndicator"
|
android:id="@+id/localFileIndicator"
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
android:layout_marginBottom="@dimen/standard_margin"
|
android:layout_marginBottom="@dimen/standard_margin"
|
||||||
android:layout_marginEnd="@dimen/standard_margin"
|
android:layout_marginEnd="@dimen/standard_margin"
|
||||||
android:layout_marginRight="@dimen/standard_margin"
|
android:layout_marginRight="@dimen/standard_margin"
|
||||||
|
android:contentDescription="@string/fab_label"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
<android.support.design.widget.BottomNavigationView
|
<android.support.design.widget.BottomNavigationView
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
android:layout_centerInParent="true"
|
android:layout_centerInParent="true"
|
||||||
android:layout_marginLeft="@dimen/standard_half_margin"
|
android:layout_marginLeft="@dimen/standard_half_margin"
|
||||||
android:layout_marginStart="@dimen/standard_half_margin"
|
android:layout_marginStart="@dimen/standard_half_margin"
|
||||||
android:contentDescription="@string/thumbnail"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/folder" />
|
android:src="@drawable/folder" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -164,7 +164,7 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:contentDescription="@string/shared_icon"
|
android:contentDescription="@string/shared_icon_share"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:paddingEnd="@dimen/list_item_share_right_margin"
|
android:paddingEnd="@dimen/list_item_share_right_margin"
|
||||||
android:paddingLeft="@dimen/standard_half_padding"
|
android:paddingLeft="@dimen/standard_half_padding"
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_marginRight="@dimen/standard_half_margin"
|
android:layout_marginRight="@dimen/standard_half_margin"
|
||||||
android:layout_marginEnd="@dimen/standard_half_margin"
|
android:layout_marginEnd="@dimen/standard_half_margin"
|
||||||
android:contentDescription="@string/share_file_icon"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/file"/>
|
android:src="@drawable/file"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_marginLeft="@dimen/standard_margin"
|
android:layout_marginLeft="@dimen/standard_margin"
|
||||||
android:layout_marginRight="@dimen/standard_margin"
|
android:layout_marginRight="@dimen/standard_margin"
|
||||||
android:contentDescription="@string/thumbnail"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/folder"/>
|
android:src="@drawable/folder"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
android:layout_width="@dimen/file_icon_size"
|
android:layout_width="@dimen/file_icon_size"
|
||||||
android:layout_height="@dimen/file_icon_size"
|
android:layout_height="@dimen/file_icon_size"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:contentDescription="@string/thumbnail"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/folder" />
|
android:src="@drawable/folder" />
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:layout_margin="@dimen/uploader_list_item_layout_image_margin"
|
android:layout_margin="@dimen/uploader_list_item_layout_image_margin"
|
||||||
android:src="@drawable/folder"
|
android:src="@drawable/folder"
|
||||||
android:contentDescription="@string/thumbnail"/>
|
android:contentDescription="@null"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
android:layout_marginEnd="@dimen/activity_icon_layout_right_end_margin"
|
android:layout_marginEnd="@dimen/activity_icon_layout_right_end_margin"
|
||||||
android:layout_marginRight="@dimen/activity_icon_layout_right_end_margin"
|
android:layout_marginRight="@dimen/activity_icon_layout_right_end_margin"
|
||||||
android:alpha="0.5"
|
android:alpha="0.5"
|
||||||
android:contentDescription="@string/thumbnail"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/ic_activity"/>
|
android:src="@drawable/ic_activity"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
<string name="drawer_item_activities">Activities</string>
|
<string name="drawer_item_activities">Activities</string>
|
||||||
<string name="drawer_item_notifications">Notifications</string>
|
<string name="drawer_item_notifications">Notifications</string>
|
||||||
<string name="drawer_quota">%1$s of %2$s used</string>
|
<string name="drawer_quota">%1$s of %2$s used</string>
|
||||||
<string name="drawer_close">Close</string>
|
<string name="drawer_close">Close sidebar</string>
|
||||||
<string name="drawer_open">Open</string>
|
<string name="drawer_open">Open sidebar</string>
|
||||||
<string name="prefs_category_general">General</string>
|
<string name="prefs_category_general">General</string>
|
||||||
<string name="prefs_category_more">More</string>
|
<string name="prefs_category_more">More</string>
|
||||||
<string name="prefs_manage_accounts">Manage accounts</string>
|
<string name="prefs_manage_accounts">Manage accounts</string>
|
||||||
|
@ -694,18 +694,17 @@
|
||||||
<string name="drawer_middle_account">Middle account</string>
|
<string name="drawer_middle_account">Middle account</string>
|
||||||
<string name="drawer_end_account">Last account</string>
|
<string name="drawer_end_account">Last account</string>
|
||||||
<string name="contactlist_item_icon">User icon for contact list</string>
|
<string name="contactlist_item_icon">User icon for contact list</string>
|
||||||
<string name="activity_icon">Activity icon</string>
|
<string name="activity_icon">Activity</string>
|
||||||
<string name="file_icon">File icon</string>
|
<string name="file_icon">File</string>
|
||||||
<string name="user_icon">User icon</string>
|
<string name="user_icon">User</string>
|
||||||
<string name="favorite_icon">Favorite icon</string>
|
<string name="favorite_icon">Favorite</string>
|
||||||
<string name="shared_via_link_icon">Shared via link icon</string>
|
<string name="synced_icon">Synced</string>
|
||||||
<string name="synced_icon">Synced icon</string>
|
<string name="available_offline_icon">Available offline</string>
|
||||||
<string name="available_offline_icon">Available offline icon</string>
|
|
||||||
<string name="checkbox">Checkbox</string>
|
<string name="checkbox">Checkbox</string>
|
||||||
<string name="thumbnail">Thumbnail</string>
|
<string name="shared_icon_share">share</string>
|
||||||
<string name="shared_icon">Shared icon</string>
|
<string name="shared_icon_shared_via_link">shared via link</string>
|
||||||
<string name="overflow_menu">Overflow menu</string>
|
<string name="shared_icon_shared">shared</string>
|
||||||
<string name="share_file_icon">Share file icon</string>
|
<string name="overflow_menu">More menu</string>
|
||||||
<string name="sort_by_name_ascending">A - Z</string>
|
<string name="sort_by_name_ascending">A - Z</string>
|
||||||
<string name="sort_by_modification_date_ascending">Newest first</string>
|
<string name="sort_by_modification_date_ascending">Newest first</string>
|
||||||
<string name="sort_by_size_descending">Biggest first</string>
|
<string name="sort_by_size_descending">Biggest first</string>
|
||||||
|
@ -827,4 +826,5 @@
|
||||||
<string name="stream_not_possible_message">Please download media instead or use external app.</string>
|
<string name="stream_not_possible_message">Please download media instead or use external app.</string>
|
||||||
<string name="folder_already_exists">Folder already exists</string>
|
<string name="folder_already_exists">Folder already exists</string>
|
||||||
<string name="notification_icon">Notification icon</string>
|
<string name="notification_icon">Notification icon</string>
|
||||||
|
<string name="fab_label">Add or upload</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in a new issue