From 2b7b92dfae902e5a3ae29701c2cc4f670d0029c4 Mon Sep 17 00:00:00 2001 From: Elliot Sisteron Date: Wed, 5 Mar 2025 02:41:44 -0800 Subject: Fix other call sites of SafetyCenterTouchTarget. Bug: 399872661 Test: atest SafetyCenterSubpagesTest && atest SafetyCenterActivityTest Flag: com.android.permission.flags.fix_safety_center_touch_target Relnote: Touch target accessibility fix for Safety Center Change-Id: I4e9f10eb8562b5a9ecbf68e5349eccf790eed0d6 --- .../permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PermissionController/src') 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) -- cgit v1.2.3-59-g8ed1b