From dfeb1f07bb28c22a18c4b9ae201964a19e21e871 Mon Sep 17 00:00:00 2001 From: Yanting Yang Date: Wed, 10 Jul 2019 19:07:04 +0800 Subject: [PATCH] Fix the clicking issue of restricted info icon When the switch controller was disabled by admin, we will show the restricted info icon on it and when user click this icon, it should pop a dialog to notify user current action not allowed. This issue was caused by the solution of fixing the a11y view focus issue b/124334500, it has been disabled the focusable and clickable attributes of icon then to block the dialog showing. Recover the focusable and clickable of restricted info icon to fix it. Fixes: 136439565 Test: visual, robotests Change-Id: I227add696870e07feca288073e90afa8e76954ee --- src/com/android/settings/widget/SwitchBar.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index f8743d1fa47..0dd59e62c98 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -249,8 +249,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC mSwitch.setEnabled(false); mSwitch.setVisibility(View.GONE); mRestrictedIcon.setVisibility(View.VISIBLE); - mRestrictedIcon.setFocusable(false); - mRestrictedIcon.setClickable(false); } else { mDisabledByAdmin = false; mSwitch.setVisibility(View.VISIBLE);