Skip to content

Commit 8f5a04c

Browse files
pubiqqdsn5ft
authored andcommitted
[NavigationView] Change navigation item pointer icon to arrow instead of hand, since they are not external links
Resolves #4316 Resolves #4315 GIT_ORIGIN_REV_ID=4e40f118f90ed05a48c5877d45db91642c7dad31 PiperOrigin-RevId: 681079283
1 parent 0ea7b58 commit 8f5a04c

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
import androidx.annotation.StyleRes;
6262
import androidx.core.content.ContextCompat;
6363
import androidx.core.graphics.drawable.DrawableCompat;
64-
import androidx.core.view.PointerIconCompat;
65-
import androidx.core.view.ViewCompat;
6664
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
6765
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
6866
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat;
@@ -659,13 +657,6 @@ public void setEnabled(boolean enabled) {
659657
smallLabel.setEnabled(enabled);
660658
largeLabel.setEnabled(enabled);
661659
icon.setEnabled(enabled);
662-
663-
if (enabled) {
664-
ViewCompat.setPointerIcon(
665-
this, PointerIconCompat.getSystemIcon(getContext(), PointerIconCompat.TYPE_HAND));
666-
} else {
667-
ViewCompat.setPointerIcon(this, null);
668-
}
669660
}
670661

671662
@Override

tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import static org.junit.Assert.assertEquals;
3434
import static org.junit.Assert.assertFalse;
3535
import static org.junit.Assert.assertNotNull;
36+
import static org.junit.Assert.assertNull;
3637
import static org.junit.Assert.assertTrue;
3738
import static org.mockito.ArgumentMatchers.any;
3839
import static org.mockito.Mockito.mock;
@@ -51,7 +52,6 @@
5152
import android.view.Menu;
5253
import android.view.MenuItem;
5354
import android.view.MotionEvent;
54-
import android.view.PointerIcon;
5555
import android.view.View;
5656
import android.view.ViewGroup;
5757
import androidx.annotation.ColorInt;
@@ -706,18 +706,17 @@ public void testSavedState() throws Throwable {
706706
@TargetApi(Build.VERSION_CODES.N)
707707
public void testPointerIcon() throws Throwable {
708708
final Activity activity = activityTestRule.getActivity();
709-
final PointerIcon expectedIcon = PointerIcon.getSystemIcon(activity, PointerIcon.TYPE_HAND);
710709
final MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_HOVER_MOVE, 0, 0, 0);
711710
final Menu menu = bottomNavigation.getMenu();
712711
for (int i = 0; i < menu.size(); i++) {
713712
final MenuItem item = menu.getItem(i);
714713
assertTrue(item.isEnabled());
715714
final View itemView = activity.findViewById(item.getItemId());
716-
assertEquals(expectedIcon, itemView.onResolvePointerIcon(event, 0));
715+
assertNull(itemView.onResolvePointerIcon(event, 0));
717716
item.setEnabled(false);
718-
assertEquals(null, itemView.onResolvePointerIcon(event, 0));
717+
assertNull(itemView.onResolvePointerIcon(event, 0));
719718
item.setEnabled(true);
720-
assertEquals(expectedIcon, itemView.onResolvePointerIcon(event, 0));
719+
assertNull(itemView.onResolvePointerIcon(event, 0));
721720
}
722721
}
723722

0 commit comments

Comments
 (0)