From 1ba1f7282b748f091a04a2c1c342033fa4696eae Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Thu, 14 Nov 2024 13:35:50 -0800 Subject: [PATCH] Fix TaskbarAllApps and TaskbarDivider contianer talkback annoucement This cl includes - setting content description on new taskbar containers for all apps and divider line, so their announcement is clear to user and not unlabelled. Test: Manual Bug: 378855202 Bug: 378845796 Flag: EXEMPT bugfix Change-Id: I4650d1960a6208189b08b16ff541b2af3ed94cb3 --- .../customization/TaskbarAllAppsButtonContainer.kt | 3 +-- .../taskbar/customization/TaskbarDividerContainer.kt | 10 +++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt index c5f8aa091d..7e3b362df5 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt @@ -21,7 +21,6 @@ import android.content.Context import android.content.res.ColorStateList import android.graphics.Color.TRANSPARENT import android.util.AttributeSet -import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.ViewConfiguration @@ -57,7 +56,7 @@ constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 } init { - LayoutInflater.from(context).inflate(R.layout.taskbar_all_apps_button, null, false) + contentDescription = context.getString(R.string.all_apps_button_label) setUpIcon() } diff --git a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt index 1fb835ab33..344f1634fd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt +++ b/quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt @@ -21,7 +21,6 @@ import android.content.Context import android.content.res.ColorStateList import android.graphics.Color.TRANSPARENT import android.util.AttributeSet -import android.view.LayoutInflater import androidx.core.view.setPadding import com.android.launcher3.R import com.android.launcher3.Utilities.dpToPx @@ -33,11 +32,8 @@ import com.android.launcher3.views.IconButtonView /** Taskbar divider view container for customizable taskbar. */ class TaskbarDividerContainer @JvmOverloads -constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0, -) : IconButtonView(context, attrs), TaskbarContainer { +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + IconButtonView(context, attrs), TaskbarContainer { private val activityContext: TaskbarActivityContext = ActivityContext.lookupContext(context) override val spaceNeeded: Int @@ -46,7 +42,7 @@ constructor( } init { - LayoutInflater.from(context).inflate(R.layout.taskbar_divider, null, false) + contentDescription = context.getString(R.string.taskbar_divider_a11y_title) setUpIcon() }