Fix remaining lint issues and remove the lint baseline

app/build.gradle

@@ -145,7 +145,6 @@ android {
 
     lintOptions {
         lintConfig = file("lint.xml")
-        baseline file("lint-baseline.xml")
         disable 'GradleDependency', 'AndroidGradlePluginVersion'
     }
 

app/src/main/java/org/mozilla/reference/browser/settings/SettingsActivity.kt

@@ -7,6 +7,7 @@ package org.mozilla.reference.browser.settings
 import android.graphics.Color
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
@@ -23,6 +24,21 @@ class SettingsActivity :
         super.onCreate(savedInstanceState)
         window.setupPersistentInsets(true)
 
+        onBackPressedDispatcher.addCallback(
+            this,
+            object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                val handled = supportFragmentManager.fragments.any {
+                    it is UserInteractionHandler && it.onBackPressed()
+                }
+                if (!handled) {
+                    remove()
+                    onBackPressedDispatcher.onBackPressed()
+                }
+            }
+        },
+        )
+
         if (savedInstanceState == null) {
             with(supportFragmentManager.beginTransaction()) {
                 replace(R.id.container, SettingsFragment())
@@ -46,15 +62,4 @@ class SettingsActivity :
     override fun updateTitle(titleResId: Int) {
         setTitle(titleResId)
     }
-
-    @Suppress("MissingSuperCall", "OVERRIDE_DEPRECATION")
-    override fun onBackPressed() {
-        supportFragmentManager.fragments.forEach {
-            if (it is UserInteractionHandler && it.onBackPressed()) {
-                return
-            } else {
-                super.onBackPressedDispatcher.onBackPressed()
-            }
-        }
-    }
 }

app/src/main/res/layout/fragment_browser.xml

@@ -72,6 +72,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:src="@drawable/mozac_ic_font"
+        android:contentDescription="@string/reader_view_appearance_button"
         android:visibility="gone"
         android:layout_marginRight="16dp"
         android:layout_marginLeft="16dp"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → app/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_icon_background"/>
     <foreground android:drawable="@drawable/ic_icon_foreground"/>
+    <monochrome android:drawable="@drawable/ic_icon_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_icon_background"/>
     <foreground android:drawable="@drawable/ic_icon_foreground"/>
+    <monochrome android:drawable="@drawable/ic_icon_foreground"/>
 </adaptive-icon>

app/src/main/res/values/strings.xml

@@ -194,6 +194,10 @@
     <string name="synced_tabs_reauth">Please re-authenticate.</string>
     <string name="synced_tabs_enable_tab_syncing">Please enable tab syncing.</string>
 
+    <!-- Reader View -->
+    <!-- Content description for the button that opens reader view appearance controls -->
+    <string name="reader_view_appearance_button">Reader view appearance</string>
+
     <!-- Add-on Preferences -->
     <!-- Preference to customize the configured AMO (addons.mozilla.org) collection -->
     <string name="preferences_customize_amo_collection">Custom Add-on collection</string>