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() }