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

remove splitActionBarWhenNarrow; hide highlighter selection while drawer is opened

Browse Source
This commit is contained in:
fkloft 2013-09-22 21:59:12 +02:00
parent 2fb0aa7a12
commit d8c8e6fcab
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/AndroidManifest.xml
View File

@ -18,8 +18,7 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/ic_iitcm" android:icon="@drawable/ic_iitcm"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:theme="@style/AppTheme">
android:uiOptions="splitActionBarWhenNarrow">
<activity <activity
android:name="com.cradle.iitc_mobile.IITC_Mobile" android:name="com.cradle.iitc_mobile.IITC_Mobile"
android:configChanges="orientation|keyboard|keyboardHidden|screenSize" android:configChanges="orientation|keyboard|keyboardHidden|screenSize"

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

@ -110,10 +110,11 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
private String mActiveHighlighter = null; private String mActiveHighlighter = null;
private boolean mDesktopMode = false; private boolean mDesktopMode = false;
private boolean mDrawerOpened;
private boolean mFullscreen = false; private boolean mFullscreen = false;
private boolean mIsLoading;
private boolean mHideInFullscreen = false; private boolean mHideInFullscreen = false;
private Pane mPane = Pane.MAP; private Pane mPane = Pane.MAP;
private boolean mIsLoading;
public IITC_NavigationHelper(IITC_Mobile activity, ActionBar bar, ListView drawerList, DrawerLayout drawerLayout) { public IITC_NavigationHelper(IITC_Mobile activity, ActionBar bar, ListView drawerList, DrawerLayout drawerLayout) {
super(activity, drawerLayout, R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close); super(activity, drawerLayout, R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close);
@ -177,6 +178,9 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
if (mHighlighters.getCount() < 2) // there should always be "No Highlights" if (mHighlighters.getCount() < 2) // there should always be "No Highlights"
showHighlighter = false; showHighlighter = false;
if(mDrawerOpened)
showHighlighter = false;
if (showHighlighter) { if (showHighlighter) {
mActionBar.setDisplayShowTitleEnabled(false); // Hide title mActionBar.setDisplayShowTitleEnabled(false); // Hide title
mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
@ -228,12 +232,16 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
public void onDrawerClosed(View drawerView) { public void onDrawerClosed(View drawerView) {
// TODO change menu? (via invalidateOptionsMenu) // TODO change menu? (via invalidateOptionsMenu)
super.onDrawerClosed(drawerView); super.onDrawerClosed(drawerView);
mDrawerOpened = false;
updateActionBar();
} }
@Override @Override
public void onDrawerOpened(View drawerView) { public void onDrawerOpened(View drawerView) {
// TODO change menu? (via invalidateOptionsMenu) // TODO change menu? (via invalidateOptionsMenu)
super.onDrawerOpened(drawerView); super.onDrawerOpened(drawerView);
mDrawerOpened=true;
updateActionBar();
} }
@Override @Override