Include item disabled state for talkback in SIM import
Test
manually verified that SIM import list functions the same as previously
and that disabled state is now included in talkback description for
items
Bug 32950353
Change-Id: Iff93cde51b0d5d0edfb1096e5bfd539c68de941a
diff --git a/res/layout/fragment_sim_import.xml b/res/layout/fragment_sim_import.xml
index d7a83f5..6688898 100644
--- a/res/layout/fragment_sim_import.xml
+++ b/res/layout/fragment_sim_import.xml
@@ -56,8 +56,8 @@
android:background="?android:colorBackground"
android:minHeight="48dp"
android:orientation="horizontal"
- android:paddingEnd="16dp"
- android:paddingStart="16dp">
+ android:paddingEnd="@dimen/activity_horizontal_margin"
+ android:paddingStart="@dimen/activity_horizontal_margin">
<ImageView
android:id="@+id/account_type_icon"
@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginEnd="10dp"
+ android:layout_marginEnd="5dp"
android:background="@null"
android:clickable="true"
android:contentDescription="@string/show_more_content_description"
diff --git a/res/layout/nav_header_main.xml b/res/layout/nav_header_main.xml
index 37a33f4..518e6e6 100644
--- a/res/layout/nav_header_main.xml
+++ b/res/layout/nav_header_main.xml
@@ -23,9 +23,9 @@
android:background="@color/contacts_accent_color"
android:gravity="bottom"
android:orientation="vertical"
- android:paddingBottom="@dimen/nav_activity_vertical_margin"
- android:paddingLeft="@dimen/nav_activity_horizontal_margin"
- android:paddingRight="@dimen/nav_activity_horizontal_margin"
- android:paddingTop="@dimen/nav_activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
</LinearLayout>
diff --git a/res/layout/sim_import_list_item.xml b/res/layout/sim_import_list_item.xml
new file mode 100644
index 0000000..86f427e
--- /dev/null
+++ b/res/layout/sim_import_list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/text"
+ android:layout_width="match_parent"
+ android:layout_height="?android:listPreferredItemHeight"
+ android:checkMark="?android:listChoiceIndicatorMultiple"
+ android:duplicateParentState="true"
+ android:gravity="center_vertical"
+ android:paddingEnd="@dimen/activity_horizontal_margin"
+ android:paddingStart="@dimen/activity_horizontal_margin"
+ android:textAppearance="?android:textAppearanceListItem"/>
diff --git a/res/layout/sim_import_list_item_disabled.xml b/res/layout/sim_import_list_item_disabled.xml
new file mode 100644
index 0000000..4647049
--- /dev/null
+++ b/res/layout/sim_import_list_item_disabled.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/text"
+ style="?android:checkedTextViewStyle"
+ android:layout_width="match_parent"
+ android:layout_height="?android:listPreferredItemHeight"
+ android:drawableEnd="?android:listChoiceIndicatorMultiple"
+ android:enabled="false"
+ android:gravity="center_vertical"
+ android:orientation="vertical"
+ android:paddingEnd="@dimen/activity_horizontal_margin"
+ android:paddingStart="@dimen/activity_horizontal_margin"
+ android:textAppearance="?android:textAppearanceListItem"
+ android:textColor="@color/contact_list_name_text_color"/>