From 6418dd24eb2c043691bffdb58e14a044bcab1af4 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 12 Aug 2013 21:37:00 -0700 Subject: ActionBarCompat uses supportInvalidateOptionsMenu() --- src/github/daneren2005/dsub/activity/SubsonicActivity.java | 14 +++++++------- .../daneren2005/dsub/fragments/DownloadFragment.java | 8 ++++---- .../dsub/fragments/SelectDirectoryFragment.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index f59d0a3f..5bb75657 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -117,7 +117,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte FragmentManager fm = getSupportFragmentManager(); currentFragment = (SubsonicFragment)fm.findFragmentByTag(ids[0]); currentFragment.setPrimaryFragment(true); - invalidateOptionsMenu(); + supportInvalidateOptionsMenu(); for(int i = 1; i < size; i++) { SubsonicFragment frag = (SubsonicFragment)fm.findFragmentByTag(ids[i]); backStack.add(frag); @@ -219,7 +219,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte currentFragment = fragment; currentFragment.setPrimaryFragment(true); - invalidateOptionsMenu(); + supportInvalidateOptionsMenu(); FragmentTransaction trans = getSupportFragmentManager().beginTransaction(); trans.add(id, fragment, tag + ""); @@ -235,7 +235,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte currentFragment = (SubsonicFragment) backStack.remove(backStack.size() - 1); currentFragment.setPrimaryFragment(true); - invalidateOptionsMenu(); + supportInvalidateOptionsMenu(); FragmentTransaction trans = getSupportFragmentManager().beginTransaction(); trans.remove(oldFrag); @@ -478,7 +478,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(currentFragment != null) { currentFragment.setPrimaryFragment(true); } - activity.invalidateOptionsMenu(); + activity.supportInvalidateOptionsMenu(); recreateSpinner(); } } @@ -511,7 +511,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte currentFragment = fragment; currentFragment.setPrimaryFragment(true); - activity.invalidateOptionsMenu(); + activity.supportInvalidateOptionsMenu(); FragmentTransaction trans = getSupportFragmentManager().beginTransaction(); trans.add(id, fragment, tag + ""); @@ -528,7 +528,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte currentFragment = fragStack.get(fragStack.size() - 1); currentFragment.setPrimaryFragment(true); - activity.invalidateOptionsMenu(); + activity.supportInvalidateOptionsMenu(); FragmentTransaction trans = getSupportFragmentManager().beginTransaction(); trans.remove(oldFrag); @@ -621,7 +621,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte List fragStack = frags.get(currentPosition); currentFragment = fragStack.get(fragStack.size() - 1); currentFragment.setPrimaryFragment(true); - activity.invalidateOptionsMenu(); + activity.supportInvalidateOptionsMenu(); } private class TabInfo { diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java index bed97137..bd5669f0 100644 --- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java +++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java @@ -618,7 +618,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe context.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getDownloadService().setKeepScreenOn(true); } - context.invalidateOptionsMenu(); + context.supportInvalidateOptionsMenu(); return true; case R.id.menu_shuffle: new SilentBackgroundTask(context) { @@ -646,12 +646,12 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe return true; case R.id.menu_toggle_now_playing: toggleNowPlaying(); - context.invalidateOptionsMenu(); + context.supportInvalidateOptionsMenu(); return true; case R.id.menu_toggle_timer: if(getDownloadService().getSleepTimer()) { getDownloadService().stopSleepTimer(); - context.invalidateOptionsMenu(); + context.supportInvalidateOptionsMenu(); } else { startTimer(); } @@ -840,7 +840,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe getDownloadService().setSleepTimerDuration(Integer.parseInt(length)); getDownloadService().startSleepTimer(); - context.invalidateOptionsMenu(); + context.supportInvalidateOptionsMenu(); } }) .setNegativeButton(R.string.common_cancel, null); diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index d75ba1b4..9c5a5360 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -450,7 +450,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter } entryList.setVisibility(View.VISIBLE); licenseValid = result.getSecond(); - context.invalidateOptionsMenu(); + context.supportInvalidateOptionsMenu(); Bundle args = getArguments(); boolean playAll = args.getBoolean(Constants.INTENT_EXTRA_NAME_AUTOPLAY, false); -- cgit v1.2.3