diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt index 7dda73f274..bab014d199 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt @@ -83,8 +83,8 @@ constructor( override fun onFinishInflate() { super.onFinishInflate() - content = findViewById(R.id.content) - arrow = findViewById(R.id.arrow) + content = requireViewById(R.id.content) + arrow = requireViewById(R.id.arrow) arrow.background = RoundedArrowDrawable( arrowWidth, diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt index 22ed28472e..277e444e7a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltipController.kt @@ -95,7 +95,7 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : tooltipStep = TOOLTIP_STEP_FEATURES inflateTooltip(R.layout.taskbar_edu_swipe) tooltip?.run { - findViewById(R.id.swipe_animation).supportLightTheme() + requireViewById(R.id.swipe_animation).supportLightTheme() show() } } @@ -114,10 +114,10 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : tooltipStep = TOOLTIP_STEP_NONE inflateTooltip(R.layout.taskbar_edu_features) tooltip?.run { - val splitscreenAnim = findViewById(R.id.splitscreen_animation) - val suggestionsAnim = findViewById(R.id.suggestions_animation) - val settingsAnim = findViewById(R.id.settings_animation) - val settingsEdu = findViewById(R.id.settings_edu) + val splitscreenAnim = requireViewById(R.id.splitscreen_animation) + val suggestionsAnim = requireViewById(R.id.suggestions_animation) + val settingsAnim = requireViewById(R.id.settings_animation) + val settingsEdu = requireViewById(R.id.settings_edu) splitscreenAnim.supportLightTheme() suggestionsAnim.supportLightTheme() settingsAnim.supportLightTheme() @@ -175,7 +175,7 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : private fun createAccessibilityDelegate() = object : View.AccessibilityDelegate() { override fun performAccessibilityAction( - host: View?, + host: View, action: Int, args: Bundle? ): Boolean { @@ -186,22 +186,22 @@ class TaskbarEduTooltipController(val activityContext: TaskbarActivityContext) : return super.performAccessibilityAction(host, action, args) } - override fun onPopulateAccessibilityEvent(host: View?, event: AccessibilityEvent?) { + override fun onPopulateAccessibilityEvent(host: View, event: AccessibilityEvent) { super.onPopulateAccessibilityEvent(host, event) - if (event?.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) { - event.text?.add(host?.context?.getText(R.string.taskbar_edu_a11y_title)) + if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) { + event.text.add(host.context?.getText(R.string.taskbar_edu_a11y_title)) } } override fun onInitializeAccessibilityNodeInfo( - host: View?, - info: AccessibilityNodeInfo? + host: View, + info: AccessibilityNodeInfo ) { super.onInitializeAccessibilityNodeInfo(host, info) - info?.addAction( + info.addAction( AccessibilityNodeInfo.AccessibilityAction( R.id.close, - host?.context?.getText(R.string.taskbar_edu_close) + host.context?.getText(R.string.taskbar_edu_close) ) ) } diff --git a/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt b/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt index 5eb240ec7c..5a5ff8e880 100644 --- a/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/VoiceInteractionWindowController.kt @@ -192,13 +192,13 @@ class VoiceInteractionWindowController(val context: TaskbarActivityContext) : removeOnAttachStateChangeListener(pendingAttachedToWindowListener) pendingAttachedToWindowListener = object : View.OnAttachStateChangeListener { - override fun onViewAttachedToWindow(v: View?) { + override fun onViewAttachedToWindow(v: View) { onAttachedToWindow() removeOnAttachStateChangeListener(this) pendingAttachedToWindowListener = null } - override fun onViewDetachedFromWindow(v: View?) {} + override fun onViewDetachedFromWindow(v: View) {} } addOnAttachStateChangeListener(pendingAttachedToWindowListener) } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt index 27a4988b6a..e704e5116b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/AbstractNavButtonLayoutter.kt @@ -40,7 +40,7 @@ abstract class AbstractNavButtonLayoutter( protected val endContextualContainer: ViewGroup, protected val startContextualContainer: ViewGroup ) : NavButtonLayoutter { - protected val homeButton: ImageView = navButtonContainer.findViewById(R.id.home) - protected val recentsButton: ImageView = navButtonContainer.findViewById(R.id.recent_apps) - protected val backButton: ImageView = navButtonContainer.findViewById(R.id.back) + protected val homeButton: ImageView = navButtonContainer.requireViewById(R.id.home) + protected val recentsButton: ImageView = navButtonContainer.requireViewById(R.id.recent_apps) + protected val backButton: ImageView = navButtonContainer.requireViewById(R.id.back) } diff --git a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt index 2092721b92..b730b215cd 100644 --- a/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt +++ b/quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt @@ -60,11 +60,12 @@ class NavButtonLayoutFactory { isThreeButtonNav: Boolean, phoneMode: Boolean ): NavButtonLayoutter { - val navButtonContainer = navButtonsView.findViewById(ID_END_NAV_BUTTONS) + val navButtonContainer = + navButtonsView.requireViewById(ID_END_NAV_BUTTONS) val endContextualContainer = - navButtonsView.findViewById(ID_END_CONTEXTUAL_BUTTONS) + navButtonsView.requireViewById(ID_END_CONTEXTUAL_BUTTONS) val startContextualContainer = - navButtonsView.findViewById(ID_START_CONTEXTUAL_BUTTONS) + navButtonsView.requireViewById(ID_START_CONTEXTUAL_BUTTONS) val isPhoneNavMode = phoneMode && isThreeButtonNav return when { isPhoneNavMode -> { diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt index 428bd95159..acf8da7638 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt +++ b/quickstep/src/com/android/quickstep/views/TaskMenuViewWithArrow.kt @@ -121,7 +121,7 @@ class TaskMenuViewWithArrow : ArrowPopup { override fun onFinishInflate() { super.onFinishInflate() - optionLayout = findViewById(R.id.menu_option_layout) + optionLayout = requireViewById(R.id.menu_option_layout) } private fun populateAndShowForTask( @@ -193,8 +193,8 @@ class TaskMenuViewWithArrow : ArrowPopup { mActivityContext.layoutInflater.inflate(R.layout.task_view_menu_option, this, false) as LinearLayout menuOption.setIconAndLabelFor( - menuOptionView.findViewById(R.id.icon), - menuOptionView.findViewById(R.id.text) + menuOptionView.requireViewById(R.id.icon), + menuOptionView.requireViewById(R.id.text) ) val lp = menuOptionView.layoutParams as LayoutParams lp.width = menuWidth diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt b/tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt index f24f0dab76..6c6a5fa8bb 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationUtilTest.kt @@ -181,7 +181,7 @@ class GridSizeMigrationUtilTest { intentIndex = c.getColumnIndex(INTENT) val cellXIndex = c.getColumnIndex(CELLX) val cellYIndex = c.getColumnIndex(CELLY) - val locMap = HashMap() + val locMap = HashMap() while (c.moveToNext()) { locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = Point(c.getInt(cellXIndex), c.getInt(cellYIndex)) @@ -424,13 +424,13 @@ class GridSizeMigrationUtilTest { c.close() } - private fun parseLocMap(context: Context, c: Cursor): Map> { + private fun parseLocMap(context: Context, c: Cursor): Map> { // Check workspace items val intentIndex = c.getColumnIndex(INTENT) val screenIndex = c.getColumnIndex(SCREEN) val cellXIndex = c.getColumnIndex(CELLX) val cellYIndex = c.getColumnIndex(CELLY) - val locMap = mutableMapOf>() + val locMap = mutableMapOf>() while (c.moveToNext()) { locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = Triple(c.getInt(screenIndex), c.getInt(cellXIndex), c.getInt(cellYIndex)) @@ -606,7 +606,7 @@ class GridSizeMigrationUtilTest { val screenIndex = c.getColumnIndex(SCREEN) // Get in which screen the icon is - val locMap = HashMap() + val locMap = HashMap() while (c.moveToNext()) { locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = c.getInt(screenIndex) @@ -668,7 +668,7 @@ class GridSizeMigrationUtilTest { val screenIndex = c.getColumnIndex(SCREEN) // Get in which screen the icon is - val locMap = HashMap() + val locMap = HashMap() while (c.moveToNext()) { locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = c.getInt(screenIndex) @@ -728,7 +728,7 @@ class GridSizeMigrationUtilTest { val screenIndex = c.getColumnIndex(SCREEN) // Get in which screen the icon is - val locMap = HashMap() + val locMap = HashMap() while (c.moveToNext()) { locMap[Intent.parseUri(c.getString(intentIndex), 0).getPackage()] = c.getInt(screenIndex)