From 3c3f041119aaf8871a6be6773a27c08749893d0f Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Mon, 4 Jul 2022 17:49:41 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/25808: Update method signature
 for View.AccessibilityDelegate.

---
 .../app/src/main/java/org/mozilla/fenix/ext/View.kt    | 18 +++++++++---------
 .../fenix/settings/TextPercentageSeekBarPreference.kt  |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/View.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/View.kt
index f8891e35f64e..53ff50e7454c 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/View.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/View.kt
@@ -43,11 +43,11 @@ fun View.removeTouchDelegate() {
 fun View.setNewAccessibilityParent(newParent: View) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.setParent(newParent)
+            info.setParent(newParent)
         }
     }
 }
@@ -64,11 +64,11 @@ fun View.updateAccessibilityCollectionItemInfo(
 ) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.collectionItemInfo =
+            info.collectionItemInfo =
                 AccessibilityNodeInfo.CollectionItemInfo.obtain(
                     rowIndex,
                     rowSpan,
@@ -90,11 +90,11 @@ fun View.updateAccessibilityCollectionInfo(
 ) {
     this.accessibilityDelegate = object : View.AccessibilityDelegate() {
         override fun onInitializeAccessibilityNodeInfo(
-            host: View?,
-            info: AccessibilityNodeInfo?,
+            host: View,
+            info: AccessibilityNodeInfo,
         ) {
             super.onInitializeAccessibilityNodeInfo(host, info)
-            info?.collectionInfo = AccessibilityNodeInfo.CollectionInfo.obtain(
+            info.collectionInfo = AccessibilityNodeInfo.CollectionInfo.obtain(
                 rowCount,
                 columnCount,
                 false,
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
index 5beb96143085..26aa94a7a8d5 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt
@@ -363,12 +363,12 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor(
             object :
                 View.AccessibilityDelegate() {
                 override fun onInitializeAccessibilityNodeInfo(
-                    host: View?,
-                    info: AccessibilityNodeInfo?,
+                    host: View,
+                    info: AccessibilityNodeInfo,
                 ) {
                     super.onInitializeAccessibilityNodeInfo(host, info)
-                    val initialInfo = info?.rangeInfo
-                    info?.rangeInfo = initialInfo?.let {
+                    val initialInfo = info.rangeInfo
+                    info.rangeInfo = initialInfo?.let {
                         AccessibilityNodeInfo.RangeInfo.obtain(
                             RANGE_TYPE_PERCENT,
                             MIN_VALUE.toFloat(),
-- 
2.11.4.GIT