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

Merge branch 'master' of https://github.com/jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Jon Atkins
2013-09-26 17:37:27 +01:00
parent 85876ad039 533057be56
commit ab1edace7b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import android.preference.PreferenceManager;
import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.text.Html; import android.text.Html;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
@ -220,7 +221,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
} }
boolean mapVisible = mDesktopMode || mPane == Pane.MAP; boolean mapVisible = mDesktopMode || mPane == Pane.MAP;
if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || !mapVisible) if ("No Highlights".equals(mHighlighter) || isDrawerOpened() || mIsLoading || !mapVisible)
mActionBar.setSubtitle(null); mActionBar.setSubtitle(null);
else else
mActionBar.setSubtitle(mHighlighter); mActionBar.setSubtitle(mHighlighter);
@ -296,6 +297,14 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnIt
mDrawerLayout.closeDrawer(mDrawerLeft); mDrawerLayout.closeDrawer(mDrawerLeft);
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home)
mDrawerLayout.closeDrawer(mDrawerRight);
return super.onOptionsItemSelected(item);
}
public void onPostCreate(Bundle savedInstanceState) { public void onPostCreate(Bundle savedInstanceState) {
// Sync the toggle state after onRestoreInstanceState has occurred. // Sync the toggle state after onRestoreInstanceState has occurred.
syncState(); syncState();