commit d1ea136cb8a1cbebba0359a0086f9df34fd2db3c
author Arc Wang <arcwang@google.com> Wed Nov 06 10:02:18 2019 +0800
committer Arc Wang <arcwang@google.com> Thu Nov 14 09:59:35 2019 +0800
tree 9eb5a150bf68dcc6ede059406c7a671a88300455
parent fe5b2d962420eb964aa9ecf9f8da4171f9b1f851

[A11Y] Fix MasterSwitchPreference onClick not callback after TalkBack is enabled

TalkBack service dispatches onClick event to the Switch component
instead of the LinearLayout wrapping it. Do all the onClick tasks
for the Switch component instead of the LinearLayout wrapping it.

Bug: 142570671
Test: MasterSwitchPreferenceTest
      Manual click the toggle button for both TalkBack enabled case and disabled case.

Change-Id: I4b2f9df309d03a477863445cd187384cdb61314b

src/com/android/settings/widget/MasterSwitchPreference.java

diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 42529cf..eb9301c 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -63,9 +63,9 @@
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-        if (widgetView != null) {
-            widgetView.setOnClickListener(new OnClickListener() {
+        final View switchWidget = holder.findViewById(R.id.switchWidget);
+        if (switchWidget != null) {
+            switchWidget.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     if (mSwitch != null && !mSwitch.isEnabled()) {