Skip to content

Commit 09d2566

Browse files
dsn5ftpaulfthomas
authored andcommitted
[MaterialToolbar][SearchBar] Update AppCompat dependency to 1.7.0 stable and remove inflateMenu dispatch pausing now that the fix has landed in AppCompat
PiperOrigin-RevId: 738894593
1 parent 0697f6f commit 09d2566

File tree

3 files changed

+1
-26
lines changed

3 files changed

+1
-26
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ androidGradlePlugin = "8.7.3"
77
androidXActivity = "1.8.0"
88
androidXAnnotation = "1.2.0"
99
androidXAnnotationExperimental = "1.0.0"
10-
androidXAppCompat = "1.6.1"
10+
androidXAppCompat = "1.7.0"
1111
androidXCardView = "1.0.0"
1212
androidXConstraintLayout = "2.1.0"
1313
androidXCoordinatorLayout = "1.1.0"

lib/java/com/google/android/material/appbar/MaterialToolbar.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@
2626
import android.content.res.TypedArray;
2727
import android.graphics.Color;
2828
import android.graphics.drawable.Drawable;
29-
import androidx.appcompat.view.menu.MenuBuilder;
3029
import androidx.appcompat.widget.Toolbar;
3130
import android.util.AttributeSet;
3231
import android.util.Pair;
33-
import android.view.Menu;
3432
import android.view.View;
3533
import android.widget.ImageView;
3634
import android.widget.TextView;
@@ -125,19 +123,6 @@ public MaterialToolbar(@NonNull Context context, @Nullable AttributeSet attrs, i
125123
initBackground(context);
126124
}
127125

128-
@Override
129-
public void inflateMenu(int i) {
130-
// Pause dispatching item changes during inflation to improve performance.
131-
Menu menu = getMenu();
132-
if (menu instanceof MenuBuilder) {
133-
((MenuBuilder) menu).stopDispatchingItemsChanged();
134-
}
135-
super.inflateMenu(i);
136-
if (menu instanceof MenuBuilder) {
137-
((MenuBuilder) menu).startDispatchingItemsChanged();
138-
}
139-
}
140-
141126
@Override
142127
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
143128
super.onLayout(changed, left, top, right, bottom);

lib/java/com/google/android/material/search/SearchBar.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@
3636
import android.os.Parcel;
3737
import android.os.Parcelable;
3838
import androidx.appcompat.content.res.AppCompatResources;
39-
import androidx.appcompat.view.menu.MenuBuilder;
4039
import androidx.appcompat.widget.ActionMenuView;
4140
import androidx.appcompat.widget.Toolbar;
4241
import android.text.TextUtils;
4342
import android.util.AttributeSet;
4443
import android.view.Gravity;
4544
import android.view.LayoutInflater;
46-
import android.view.Menu;
4745
import android.view.View;
4846
import android.view.ViewGroup;
4947
import android.view.accessibility.AccessibilityNodeInfo;
@@ -370,16 +368,8 @@ private void setNavigationIconDecorative(boolean decorative) {
370368

371369
@Override
372370
public void inflateMenu(@MenuRes int resId) {
373-
// Pause dispatching item changes during inflation to improve performance.
374-
Menu menu = getMenu();
375-
if (menu instanceof MenuBuilder) {
376-
((MenuBuilder) menu).stopDispatchingItemsChanged();
377-
}
378371
super.inflateMenu(resId);
379372
this.menuResId = resId;
380-
if (menu instanceof MenuBuilder) {
381-
((MenuBuilder) menu).startDispatchingItemsChanged();
382-
}
383373
}
384374

385375
@Override

0 commit comments

Comments
 (0)