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

* removed not used import

Browse Source 
* handle home button correctly
* update currentPane after backStack.pop()
This commit is contained in:
Philipp Schaefer 2013-05-25 12:23:27 +02:00
parent 7ada77ac21
commit 0a97d6a5e4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package com.cradle.iitc_mobile;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import android.annotation.TargetApi;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.SearchManager; import android.app.SearchManager;
@ -255,8 +254,6 @@ public class IITC_Mobile extends Activity {
} }
private void BackStackPop() { private void BackStackPop() {
int index = backStack.size() - 1;
int itemId = backStack.remove(index);
if (backStack.isEmpty()) { if (backStack.isEmpty()) {
// Empty back stack means we should be at home (ie map) screen // Empty back stack means we should be at home (ie map) screen
SetActionBarHomeEnabledWithUp(false); SetActionBarHomeEnabledWithUp(false);
@ -264,6 +261,9 @@ public class IITC_Mobile extends Activity {
iitc_view.loadUrl("javascript: window.show('map');"); iitc_view.loadUrl("javascript: window.show('map');");
return; return;
} }
int index = backStack.size() - 1;
int itemId = backStack.remove(index);
currentPane = itemId;
HandleMenuItemSelected(itemId, false); HandleMenuItemSelected(itemId, false);
} }
@ -310,6 +310,8 @@ public class IITC_Mobile extends Activity {
if (!backStack.isEmpty()) { if (!backStack.isEmpty()) {
BackStackPop(); BackStackPop();
} }
iitc_view.loadUrl("javascript: window.show('map');");
actionBar.setTitle(getString(R.string.app_name));
return true; return true;
case R.id.reload_button: case R.id.reload_button:
actionBar.setTitle(getString(R.string.app_name)); actionBar.setTitle(getString(R.string.app_name));