commit 749dabb46ceb8d64d932315337d837ce0f31efc2
author Sunny Shao <sunnyshao@google.com> Fri Jul 10 07:21:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 10 07:21:44 2020 +0000
tree ccd50ed335a345878ca568c352a2e32bc048422b
parent 520c876866072418c92a31d8c566615cdfc53872
parent cfffebd5c49ecbcaf3ae56e555e605968a662787

Fix toggle widget can be switched under overlapped view am: 4794b798c4 am: cfffebd5c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12124562

Change-Id: Ie99be59204c03dcac32aeb29dd2a9c05a95309b9

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

diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java
index 90f1dbd..aeb779f 100644
--- a/src/com/android/settings/widget/AppSwitchPreference.java
+++ b/src/com/android/settings/widget/AppSwitchPreference.java
@@ -36,7 +36,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }

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

diff --git a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
index c5e0217..f4c3a14 100644
--- a/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesRestrictedSwitchPreference.java
@@ -52,7 +52,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }

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

diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
index a4e3c6e..1b4d681 100644
--- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
@@ -50,7 +50,8 @@
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
-            switchView.setFilterTouchesWhenObscured(true);
+            final View rootView = switchView.getRootView();
+            rootView.setFilterTouchesWhenObscured(true);
         }
     }
 }