summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-10-28 21:31:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-28 21:31:28 +0000
commit461e80122c112f59863551deb60927dcd9c70643 (patch)
treeb7f30a1cc911054190c6a3fd698758391b54b6fb
parent75c61a15ab413b7d8477ffc08f8ba32be7287d66 (diff)
parentf5b31d096a67bf7e1f768b80f74a62c243f1f307 (diff)
Merge "Tweak accessibility in for call blocking settings." into ub-contactsdialer-a-dev
am: f5b31d096a * commit 'f5b31d096a67bf7e1f768b80f74a62c243f1f307': Tweak accessibility in for call blocking settings.
-rw-r--r--res/layout/blocked_number_header.xml13
-rw-r--r--src/com/android/dialer/filterednumber/BlockedNumbersFragment.java7
2 files changed, 16 insertions, 4 deletions
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml
index ce1d4feab..29a05bd26 100644
--- a/res/layout/blocked_number_header.xml
+++ b/res/layout/blocked_number_header.xml
@@ -17,7 +17,8 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:focusable="false">
<LinearLayout android:id="@+id/blocked_numbers_disabled_for_emergency"
android:layout_width="match_parent"
@@ -25,6 +26,7 @@
android:orientation="vertical"
android:layout_marginBottom="8dp"
android:padding="16dp"
+ android:focusable="true"
android:visibility="gone">
<TextView
@@ -58,7 +60,8 @@
android:gravity="center_vertical"
android:padding="16dp"
android:paddingEnd="8dp"
- android:background="@android:color/white">
+ android:background="@android:color/white"
+ android:focusable="true">
<TextView
android:layout_width="0dp"
@@ -70,7 +73,8 @@
<Switch android:id="@+id/hide_blocked_calls_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="40dp" />
+ android:layout_marginLeft="40dp"
+ android:focusable="false" />
</LinearLayout>
@@ -85,7 +89,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@android:color/white">
+ android:background="@android:color/white"
+ android:focusable="true">
<TextView android:id="@+id/textView"
android:layout_width="wrap_content"
diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
index fa40e2609..b57aa5ae5 100644
--- a/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
+++ b/src/com/android/dialer/filterednumber/BlockedNumbersFragment.java
@@ -79,6 +79,13 @@ public class BlockedNumbersFragment extends ListFragment
FilteredNumbersUtil.setShouldHideBlockedCalls(getActivity(), isChecked);
}
});
+ getActivity().findViewById(R.id.hide_blocked_calls_setting).setOnClickListener(
+ new View.OnClickListener() {
+ @Override
+ public void onClick(final View view) {
+ mHideSettingSwitch.toggle();
+ }
+ });
mImportSettings = getActivity().findViewById(R.id.import_settings);
mBlockedNumbersDisabledForEmergency =