diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-22 19:26:59 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-22 19:26:59 +0200 |
| commit | 775a273b4b055cf2d1ebe76f67a87f02a32f422d (patch) | |
| tree | 1133e9bdd3a6867a8d90367f49d250984290913a /main/src | |
| parent | 86f406921842afbb045d09284c948cf221ec37fb (diff) | |
| parent | 96c1780bbe2dd3943de9827d315a6271c8a21cb2 (diff) | |
| download | cgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.zip cgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.tar.gz cgeo-775a273b4b055cf2d1ebe76f67a87f02a32f422d.tar.bz2 | |
Merge pull request #3892 from schwabe/fix_3884
Flatten menu in the List menu, fixes #3884
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/CacheListActivity.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java index fa51137..c681d00 100644 --- a/main/src/cgeo/geocaching/CacheListActivity.java +++ b/main/src/cgeo/geocaching/CacheListActivity.java @@ -640,7 +640,8 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA setVisible(menu, R.id.menu_switch_select_mode, !isEmpty); setVisible(menu, R.id.submenu_manage, (isHistory && !isEmpty) || isOffline); - setVisible(menu, R.id.submenu_manage_lists, isOffline); + + setVisible(menu, R.id.menu_create_list, isOffline); setVisible(menu, R.id.menu_sort, !isEmpty && !isHistory); setVisible(menu, R.id.menu_refresh_stored, !isEmpty && (isConcrete || type != CacheListType.OFFLINE)); @@ -676,8 +677,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA menu.findItem(R.id.menu_drop_list).setVisible(isNonDefaultList); menu.findItem(R.id.menu_rename_list).setVisible(isNonDefaultList); - final boolean multipleLists = DataStore.getLists().size() >= 2; - menu.findItem(R.id.menu_switch_list).setVisible(multipleLists); menu.findItem(R.id.menu_move_to_list).setVisible(!isEmpty); setMenuItemLabel(menu, R.id.menu_remove_from_history, R.string.cache_remove_from_history, R.string.cache_clear_history); @@ -771,10 +770,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA adapter.invertSelection(); invalidateOptionsMenuCompatible(); return false; - case R.id.menu_switch_list: - selectList(); - invalidateOptionsMenuCompatible(); - return false; case R.id.menu_filter: showFilterMenu(null); return true; @@ -1413,13 +1408,6 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA } } - public void selectList() { - if (!type.canSwitch) { - return; - } - new StoredList.UserInterface(this).promptForListSelection(R.string.list_title, getListSwitchingRunnable()); - } - @NonNull private Action1<Integer> getListSwitchingRunnable() { return new Action1<Integer>() { |