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

Merge branch 'master' into navdrawer-api

Browse Source 
Conflicts:
	mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
This commit is contained in:
fkloft
2013-12-03 23:48:54 +01:00
parent 6c0327b01c 270705cf6c
commit 0dcc9bfd7e
138 changed files with 130 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,6 +369,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
// Pop last item from backstack and pretend the relevant menu item was clicked
if (!mBackStack.isEmpty()) {
backStackPop();
mBackButtonPressed = true;
return;
}
@ -404,8 +405,10 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
// map pane is top-lvl. clear stack.
if (pane == Pane.MAP) mBackStack.clear();
else mBackStack.push(mCurrentPane);
// don't push current pane to backstack if this method was called via back button
else if (!mBackButtonPressed) mBackStack.push(mCurrentPane);
mBackButtonPressed = false;
mCurrentPane = pane;
mNavigationHelper.switchTo(pane);
}