Review: Update isHighContrastModeEnabled() context extension with the use of a new available API

Author: paulinea

core/src/main/java/com/orange/ouds/core/extensions/ContextExt.kt

@@ -14,25 +14,29 @@ package com.orange.ouds.core.extensions
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Build
 import android.view.accessibility.AccessibilityManager
 import com.orange.ouds.foundation.extensions.orElse
 import com.orange.ouds.foundation.extensions.tryOrNull
 
 /**
  * @return true if the high contrast mode is enabled on the device, false otherwise
  */
-@SuppressLint("DiscouragedPrivateApi", "PrivateApi")
+@SuppressLint("PrivateApi")
 internal fun Context.isHighContrastModeEnabled(): Boolean {
     val accessibilityManager = getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager
 
-    return with(accessibilityManager) {
-        // Workaround to access mIsHighTextContrastEnabled field because it is hidden with a @UnsupportedAppUsage annotation
-        // On some OS versions this field is named mIsHighContrastTextEnabled
-        // TODO Use high text contrast APIs once API level 36 is available
-        tryOrNull { javaClass.getDeclaredField("mIsHighTextContrastEnabled") }
-            .orElse { tryOrNull { javaClass.getDeclaredField("mIsHighContrastTextEnabled") } }
-            ?.also { it.isAccessible = true }
-            ?.getBoolean(this)
-            .orElse { false }
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+        accessibilityManager.isHighContrastTextEnabled
+    } else {
+        with(accessibilityManager) {
+            // Workaround to access mIsHighTextContrastEnabled field because it is hidden with a @UnsupportedAppUsage annotation
+            // On some OS versions this field is named mIsHighContrastTextEnabled
+            tryOrNull { javaClass.getDeclaredField("mIsHighTextContrastEnabled") }
+                .orElse { tryOrNull { javaClass.getDeclaredField("mIsHighContrastTextEnabled") } }
+                ?.also { it.isAccessible = true }
+                ?.getBoolean(this)
+                .orElse { false }
+        }
     }
 }