PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TaskbarAllApps and TaskbarDivider contianer talkback annoucement" into main

Browse Source
This commit is contained in:
Jagrut Desai
2024-11-15 00:05:43 +00:00
committed by Android (Google) Code Review
parent 8a9e7a1dfd 1ba1f7282b
commit b03d9393ce
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/customization/TaskbarAllAppsButtonContainer.kt
+1 -2
View File
@@ -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()
}
quickstep/src/com/android/launcher3/taskbar/customization/TaskbarDividerContainer.kt
+3 -7
View File
@@ -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()
}