Fix toggle widget can be switched under overlapped view
- ag/11612781 added filterTouchesWhenObscured to toggle widget
can't prevent the click behavior pass through the overlapped view.
- Due to click events was handled by SwitchPreference instead of the
toggle widget.
- Enable the filterTouchesWhenObscured attribute on all
SwitchPreferences in all pages of the special app access.
Bug: 155288585
Test: manual test
Here is the test steps
1.Create an overlapped view's app and launch it to overlap the
other apps.
2.Launch Settings
3.Goto Apps & notification > Advanced > Special app access
4.Click any toggle under Special app access to monitor it can be
switched or not. It must be not switched.
Change-Id: I9c9cf4719153292ed03f55a6eb9d3a308677aee3
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);
}
}
}
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);
}
}
}
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);
}
}
}
