[Gradle] Update to AGP 7.4.2 to get latest lint and fix Android U lin…

…t issues PiperOrigin-RevId: 520691813
material-components · Mar 30, 2023 · 5a37e4b · 5a37e4b
1 parent c7d31fb
commit 5a37e4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.0'
+    classpath 'com.android.tools.build:gradle:7.4.2'
   }
 }
 

diff --git a/catalog/build.gradle b/catalog/build.gradle
@@ -118,10 +118,6 @@ android {
     unitTests.returnDefaultValues = true
   }
 
-  aaptOptions {
-    additionalParameters "--no-version-vectors"
-  }
-
   sourceSets {
     main {
       manifest.srcFile 'java/io/material/catalog/AndroidManifest.xml'
@@ -146,4 +142,7 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+  androidResources {
+    additionalParameters '--no-version-vectors'
+  }
 }
diff --git a/lib/java/com/google/android/material/search/SearchView.java b/lib/java/com/google/android/material/search/SearchView.java
@@ -285,12 +285,11 @@ public void handleBackInvoked() {
     }
 
     BackEvent backEvent = searchViewAnimationHelper.onHandleBackInvoked();
-    if (searchBar == null || backEvent == null || !BuildCompat.isAtLeastU()) {
+    if (BuildCompat.isAtLeastU() && searchBar != null && backEvent != null) {
+      searchViewAnimationHelper.finishBackProgress();
+    } else {
       hide();
-      return;
     }
-
-    searchViewAnimationHelper.finishBackProgress();
   }
 
   @RequiresApi(VERSION_CODES.UPSIDE_DOWN_CAKE)