From d8c8e6fcaba5bef515ffdca643bbeabac0c5127d Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Sun, 22 Sep 2013 21:59:12 +0200
Subject: [PATCH] remove splitActionBarWhenNarrow; hide highlighter selection
 while drawer is opened

---
 mobile/AndroidManifest.xml                             |  3 +--
 .../com/cradle/iitc_mobile/IITC_NavigationHelper.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml
index 2dc57bbc..bb2ce6b3 100644
--- a/mobile/AndroidManifest.xml
+++ b/mobile/AndroidManifest.xml
@@ -18,8 +18,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_iitcm"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:uiOptions="splitActionBarWhenNarrow">
+        android:theme="@style/AppTheme">
         <activity
             android:name="com.cradle.iitc_mobile.IITC_Mobile"
             android:configChanges="orientation|keyboard|keyboardHidden|screenSize"
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index 14af431f..3f152dde 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -110,10 +110,11 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
 
     private String mActiveHighlighter = null;
     private boolean mDesktopMode = false;
+    private boolean mDrawerOpened;
     private boolean mFullscreen = false;
+    private boolean mIsLoading;
     private boolean mHideInFullscreen = false;
     private Pane mPane = Pane.MAP;
-    private boolean mIsLoading;
 
     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);
@@ -176,6 +177,9 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
 
         if (mHighlighters.getCount() < 2) // there should always be "No Highlights"
             showHighlighter = false;
+        
+        if(mDrawerOpened)
+            showHighlighter = false;
 
         if (showHighlighter) {
             mActionBar.setDisplayShowTitleEnabled(false); // Hide title
@@ -228,12 +232,16 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
     public void onDrawerClosed(View drawerView) {
         // TODO change menu? (via invalidateOptionsMenu)
         super.onDrawerClosed(drawerView);
+        mDrawerOpened = false;
+        updateActionBar();
     }
 
     @Override
     public void onDrawerOpened(View drawerView) {
         // TODO change menu? (via invalidateOptionsMenu)
         super.onDrawerOpened(drawerView);
+        mDrawerOpened=true;
+        updateActionBar();
     }
 
     @Override