Skip to content

Commit 3b11e74

Browse files
imhappihunterstich
authored andcommitted
[NavigationRail] Design review adjustments
PiperOrigin-RevId: 698483697
1 parent 10f3d3b commit 3b11e74

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

catalog/java/io/material/catalog/navigationrail/NavigationRailSubMenuDemoFragment.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,12 @@ public View onCreateDemoView(
7878
efab.shrink();
7979
navigationRailView.collapse();
8080
button.setContentDescription(getResources().getString(R.string.cat_navigation_rail_expand_button_description));
81+
button.setImageResource(R.drawable.ic_drawer_menu_24px);
8182
} else {
8283
efab.extend();
8384
navigationRailView.expand();
8485
button.setContentDescription(getResources().getString(R.string.cat_navigation_rail_collapse_button_description));
86+
button.setImageResource(R.drawable.gs_menu_open_vd_theme_24);
8587
}
8688
});
8789
return view;

lib/java/com/google/android/material/navigation/NavigationBarMenuView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import android.view.View;
3737
import android.view.ViewGroup;
3838
import android.view.accessibility.AccessibilityNodeInfo;
39+
import android.widget.TextView;
3940
import androidx.annotation.Dimension;
4041
import androidx.annotation.NonNull;
4142
import androidx.annotation.Nullable;
@@ -139,6 +140,7 @@ public NavigationBarMenuView(@NonNull Context context) {
139140
} else {
140141
set = new AutoTransition();
141142
set.setOrdering(TransitionSet.ORDERING_TOGETHER);
143+
set.excludeTarget(TextView.class, true);
142144
set.setDuration(
143145
MotionUtils.resolveThemeDuration(
144146
getContext(),

0 commit comments

Comments
 (0)