phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete menu items

Browse Source
This commit is contained in:
fkloft
2013-09-22 21:46:11 +02:00
parent 358c809d07
commit 2fb0aa7a12
4 changed files with 8 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -387,15 +387,16 @@ public class IITC_Mobile extends Activity {
getMenuInflater().inflate(R.menu.main, menu);
// Get the SearchView and set the searchable configuration
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
this.mSearchMenuItem = menu.findItem(R.id.menu_search);
mSearchMenuItem = menu.findItem(R.id.menu_search);
final SearchView searchView =
(SearchView) mSearchMenuItem.getActionView();
// Assumes current activity is the searchable activity
searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
searchView.setIconifiedByDefault(false); // Do not iconify the widget; expand it by default
// enable/disable mDesktopMode menu
enableDesktopUI(menu);
enableAdvancedMenu(menu);
MenuItem item = menu.findItem(R.id.menu_clear_cookies);
item.setVisible(mAdvancedMenu);
return true;
}
@ -446,24 +447,6 @@ public class IITC_Mobile extends Activity {
.getIITCVersion());
startActivity(intent);
return true;
case R.id.menu_info:
switchToPane(Pane.INFO);
return true;
case R.id.menu_full:
switchToPane(Pane.FULL);
return true;
case R.id.menu_compact:
switchToPane(Pane.COMPACT);
return true;
case R.id.menu_public:
switchToPane(Pane.PUBLIC);
return true;
case R.id.menu_faction:
switchToPane(Pane.FACTION);
return true;
case R.id.menu_debug:
switchToPane(Pane.DEBUG);
return true;
case R.id.menu_clear_cookies:
CookieManager cm = CookieManager.getInstance();
cm.removeAllCookie();
@ -579,17 +562,6 @@ public class IITC_Mobile extends Activity {
setLoadingState(true);
}
// disable/enable some menu buttons...
public void enableDesktopUI(Menu menu) {
MenuItem item;
item = menu.findItem(R.id.menu_chat);
item.setVisible(!mDesktopMode);
item = menu.findItem(R.id.menu_info);
item.setVisible(!mDesktopMode);
item = menu.findItem(R.id.menu_debug);
item.setVisible(!mDesktopMode);
}
// remove dialog and add it back again
// to ensure it is the last element of the list
// focused dialogs should be closed first
@ -622,14 +594,6 @@ public class IITC_Mobile extends Activity {
}
}
public void enableAdvancedMenu(Menu menu) {
MenuItem item;
item = menu.findItem(R.id.menu_debug);
item.setVisible(mAdvancedMenu);
item = menu.findItem(R.id.menu_clear_cookies);
item.setVisible(mAdvancedMenu);
}
/**
* @deprecated ActionBar related stuff should be handled by IITC_NavigationHelper
* @see getNavigationHelper()

4
mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
View File

@ -226,13 +226,13 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
@Override
public void onDrawerClosed(View drawerView) {
// TODO Auto-generated method stub
// TODO change menu? (via invalidateOptionsMenu)
super.onDrawerClosed(drawerView);
}
@Override
public void onDrawerOpened(View drawerView) {
// TODO Auto-generated method stub
// TODO change menu? (via invalidateOptionsMenu)
super.onDrawerOpened(drawerView);
}