[NavigationView] Update foreground boundaries of menu items when setting a new foreground

pubiqq · hunterstich · commit 4dc3d93ac24d · 2022-07-06T04:52:55.000-07:00
Resolves #2737 Resolves #2735 GIT_ORIGIN_REV_ID=8632d22d414f592378b68a8d27f7fba73edc28f9 PiperOrigin-RevId: 458198734
diff --git a/lib/java/com/google/android/material/internal/ForegroundLinearLayout.java b/lib/java/com/google/android/material/internal/ForegroundLinearLayout.java
@@ -124,7 +124,6 @@ protected boolean verifyDrawable(Drawable who) {
     return super.verifyDrawable(who) || (who == foreground);
   }
 
-  @RequiresApi(11)
   @Override
   public void jumpDrawablesToCurrentState() {
     super.jumpDrawablesToCurrentState();
@@ -157,6 +156,7 @@ public void setForeground(@Nullable Drawable drawable) {
       }
 
       foreground = drawable;
+      foregroundBoundsChanged = true;
 
       if (drawable != null) {
         setWillNotDraw(false);

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@ protected boolean verifyDrawable(Drawable who) {`
`124`	`124`	`return super.verifyDrawable(who) \|\| (who == foreground);`
`125`	`125`	`}`
`126`	`126`
`127`		`- @RequiresApi(11)`
`128`	`127`	`@Override`
`129`	`128`	`public void jumpDrawablesToCurrentState() {`
`130`	`129`	`super.jumpDrawablesToCurrentState();`
`@@ -157,6 +156,7 @@ public void setForeground(@Nullable Drawable drawable) {`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`foreground = drawable;`
	`159`	`+ foregroundBoundsChanged = true;`
`160`	`160`
`161`	`161`	`if (drawable != null) {`
`162`	`162`	`setWillNotDraw(false);`