commit cfffebd5c49ecbcaf3ae56e555e605968a662787
author Sunny Shao <sunnyshao@google.com> Fri Jul 10 07:09:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 10 07:09:34 2020 +0000
tree a30b8586cb2225b28682d8f37bb692073cbdfa46
parent 1801f5247e2fdc66f4c9848822474e4a85789b67
parent 4794b798c427c53a9d0f8c608c367a3e6469ed5f

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

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

Change-Id: I767f72eae29753c9936c505b6c6348650ef6b3c6

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);
         }
     }
 }