For mozilla-mobile#20634: remove some lint issues from baseline

RotBolt · Sep 17, 2021 · fd00266 · fd00266
1 parent 6ac10d5
commit fd00266
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 240 deletions.
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
@@ -9,7 +9,11 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <!-- Allows for storing and retrieving screenshots -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage"
+        />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <!-- Allows changing locales -->

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"
+        tools:ignore="ScopedStorage"
+        />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />

diff --git a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
@@ -1,6 +1,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.components
 
 import android.content.Context

diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.components.tips.providers
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
@@ -73,6 +74,7 @@ class MasterPasswordTipProvider(
             titleDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_login)
         )
 
+    @SuppressLint("InflateParams")
     private fun showMasterPasswordMigration() {
         val dialogView = LayoutInflater.from(context).inflate(R.layout.mp_migration_dialog, null)
 
@@ -161,6 +163,7 @@ class MasterPasswordTipProvider(
         }
     }
 
+    @SuppressLint("InflateParams")
     private fun showFailureDialog() {
         val dialogView =
             LayoutInflater.from(context).inflate(R.layout.mp_migration_done_dialog, null)
@@ -221,6 +224,7 @@ class MasterPasswordTipProvider(
         }
     }
 
+    @SuppressLint("InflateParams")
     private fun showSuccessDialog() {
         dismissMPTip()
 

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -751,6 +751,7 @@ class HomeFragment : Fragment() {
         }
     }
 
+    @SuppressLint("InflateParams")
     private fun recommendPrivateBrowsingShortcut() {
         context?.let { context ->
             val layout = LayoutInflater.from(context)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.home.sessioncontrol
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.widget.EditText
 import androidx.annotation.VisibleForTesting
@@ -316,6 +317,7 @@ class DefaultSessionControlController(
         )
     }
 
+    @SuppressLint("InflateParams")
     override fun handleRenameTopSiteClicked(topSite: TopSite) {
         activity.let {
             val customLayout =

diff --git a/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/DefaultBrowserPreference.kt
@@ -6,9 +6,9 @@ package org.mozilla.fenix.settings
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.Switch
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
+import com.google.android.material.switchmaterial.SwitchMaterial
 import org.mozilla.fenix.R
 import org.mozilla.fenix.utils.BrowsersCache
 
@@ -17,15 +17,15 @@ class DefaultBrowserPreference @JvmOverloads constructor(
     attrs: AttributeSet? = null
 ) : Preference(context, attrs) {
 
-    private var switchView: Switch? = null
+    private var switchView: SwitchMaterial? = null
 
     init {
         widgetLayoutResource = R.layout.preference_default_browser
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
-        switchView = holder.findViewById(R.id.switch_widget) as Switch
+        switchView = holder.findViewById(R.id.switch_widget) as SwitchMaterial
 
         updateSwitch()
     }

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -229,6 +229,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         updateMakeDefaultBrowserPreference()
     }
 
+    @SuppressLint("InflateParams")
     @Suppress("ComplexMethod", "LongMethod")
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         // Hide the scrollbar so the animation looks smoother

diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.search
 
+import android.annotation.SuppressLint
 import android.content.res.Resources
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
@@ -238,6 +239,7 @@ class AddSearchEngineFragment :
         toggleCustomForm(selectedIndex == -1)
     }
 
+    @SuppressLint("InflateParams")
     private fun makeCustomButton(layoutInflater: LayoutInflater): CustomSearchEngineRadioButtonBinding {
         val wrapper = layoutInflater
             .inflate(R.layout.custom_search_engine_radio_button, null) as ConstraintLayout
@@ -254,6 +256,7 @@ class AddSearchEngineFragment :
         customSearchEngine.customSearchEnginesLearnMore.isEnabled = isEnabled
     }
 
+    @SuppressLint("InflateParams")
     private fun makeButtonFromSearchEngine(
         engine: SearchEngine,
         layoutInflater: LayoutInflater,

diff --git a/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java b/app/src/main/java/org/mozilla/fenix/utils/OnWifiChanged.java
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 package org.mozilla.fenix.utils;
 
 /**

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -17,7 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="56dp" />
 
-    <fragment
+    <!--The navGraph is set dynamically in NavGraphProvider -->
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/container"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/mozac_browser_menu_item_switch.xml b/app/src/main/res/layout/mozac_browser_menu_item_switch.xml
@@ -2,7 +2,7 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   -  License, v. 2.0. If a copy of the MPL was not distributed with this
   -  file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Mozac.Browser.Menu.Item.Text"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mozac_browser_menu_item_container_layout_height"

diff --git a/app/src/main/res/layout/preference_default_browser.xml b/app/src/main/res/layout/preference_default_browser.xml
@@ -3,7 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<Switch xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/switch_widget"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"

diff --git a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt
@@ -27,7 +27,12 @@ class PerformanceInflaterTest {
     private val layoutsNotToTest = setOf(
         "fragment_browser",
         "fragment_add_on_internal_settings",
-        "activity_privacy_content_display"
+        "activity_privacy_content_display",
+        /**
+         *  activity_home.xml contains FragmentContainerView which needs to be
+         *  put inside FragmentActivity in order to get inflated
+         */
+        "activity_home"
     )
 
     @Before