summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt4
-rw-r--r--flags/flags.aconfig9
2 files changed, 11 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
index 44d055d5e..ccfa8f867 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
@@ -22,6 +22,7 @@ import android.view.TouchDelegate
import android.view.View
import androidx.annotation.DimenRes
import androidx.annotation.RequiresApi
+import com.android.permission.flags.Flags
/** Class to configure touch targets for Safety Center. */
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
@@ -43,8 +44,7 @@ object SafetyCenterTouchTarget {
@DimenRes minTouchTargetSizeResource: Int,
useWidthHeightFix: Boolean,
) {
- // TODO: b/399872661 - Look into fixing all call sites and remove this boolean.
- if (useWidthHeightFix) {
+ if (useWidthHeightFix || Flags.fixSafetyCenterTouchTarget()) {
configureSizeUsingBothWidthAndHeight(view, minTouchTargetSizeResource)
} else {
configureSizeUsingWidthOnly(view, minTouchTargetSizeResource)
diff --git a/flags/flags.aconfig b/flags/flags.aconfig
index 866d27d43..99a50ab7d 100644
--- a/flags/flags.aconfig
+++ b/flags/flags.aconfig
@@ -165,3 +165,12 @@ flag {
bug: "388234667"
is_fixed_read_only: true
}
+
+flag {
+ name: "fix_safety_center_touch_target"
+ is_exported: true
+ namespace: "permissions"
+ description: "This flag fixes an issue with the SafetyCenterTouchTarget code"
+ bug: "399872661"
+ is_fixed_read_only: true
+}