From 416a41a6b89d52e27ba59d31e1dce568fa73a0c9 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 8 Oct 2015 10:54:07 -0500 Subject: [PATCH] [android] #2462 - Removing checkable capabilities in NavigationDrawer due to current Support Library bug --- .../java/com/mapbox/mapboxsdk/testapp/MainActivity.java | 8 -------- .../src/main/res/menu/menu_drawer.xml | 7 +------ 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java index 4035a49bc..ee0aba008 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/MainActivity.java @@ -268,19 +268,16 @@ public class MainActivity extends AppCompatActivity { // Toggle debug mode mMapView.toggleDebug(); toggleFpsCounter(mMapView.isDebugActive()); - menuItem.setChecked(mMapView.isDebugActive()); return true; case R.id.action_markers: // Toggle markers toggleAnnotations(!mIsAnnotationsOn); - menuItem.setChecked(mIsAnnotationsOn); return true; case R.id.action_compass: // Toggle compass mMapView.setCompassEnabled(!mMapView.isCompassEnabled()); - menuItem.setChecked(mMapView.isCompassEnabled()); return true; case R.id.action_info_window_adapter: @@ -324,31 +321,26 @@ public class MainActivity extends AppCompatActivity { switch (id) { case R.id.actionStyleMapboxStreets: mMapView.setStyleUrl(MapView.StyleUrls.MAPBOX_STREETS); - mNavigationView.getMenu().findItem(id).setChecked(true); mSelectedStyle = id; return true; case R.id.actionStyleEmerald: mMapView.setStyleUrl(MapView.StyleUrls.EMERALD); - mNavigationView.getMenu().findItem(id).setChecked(true); mSelectedStyle = id; return true; case R.id.actionStyleLight: mMapView.setStyleUrl(MapView.StyleUrls.LIGHT); - mNavigationView.getMenu().findItem(id).setChecked(true); mSelectedStyle = id; return true; case R.id.actionStyleDark: mMapView.setStyleUrl(MapView.StyleUrls.DARK); - mNavigationView.getMenu().findItem(id).setChecked(true); mSelectedStyle = id; return true; case R.id.actionStyleSatellite: mMapView.setStyleUrl(MapView.StyleUrls.SATELLITE); - mNavigationView.getMenu().findItem(id).setChecked(true); mSelectedStyle = id; return true; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml index 007457d40..8d1bb289b 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/menu/menu_drawer.xml @@ -7,19 +7,16 @@ @@ -32,9 +29,7 @@ android:title="@string/navdrawer_menu_title_mainactivity_styles"> + android:id="@+id/stylesGroup">