Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-10-20 11:15:04 +02:00
commit 9c1cff0fd3
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -272,6 +272,13 @@ public class MapActivity extends AccessibleActivity {
setIntent(intent);
}
@Override
public void onBackPressed() {
if (!mapActions.onBackPressed()){
super.onBackPressed();
}
}
@Override
protected void onResume() {
super.onResume();
@ -465,7 +472,7 @@ public class MapActivity extends AccessibleActivity {
}
return true;
} else if (keyCode == KeyEvent.KEYCODE_MENU && event.getRepeatCount() == 0) {
mapActions.createOptionsMenuAsDrawer(true);
mapActions.onMenuPressed();
return true;
} else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0) {
Intent newIntent = new Intent(MapActivity.this, getMyApplication().getAppCustomization().getSearchActivity());

26
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -92,6 +92,9 @@ public class MapActivityActions implements DialogProvider {
private final MapActivity mapActivity;
private OsmandSettings settings;
private RoutingHelper routingHelper;
DrawerLayout mDrawerLayout;
ListView mDrawerList;
public MapActivityActions(MapActivity mapActivity){
@ -723,11 +726,28 @@ public class MapActivityActions implements DialogProvider {
break;
}
}
public boolean onBackPressed(){
if (mDrawerLayout.isDrawerOpen(mDrawerList)){
mDrawerLayout.closeDrawer(mDrawerList);
return true;
}
return false;
}
public void onMenuPressed(){
if (mDrawerLayout.isDrawerOpen(mDrawerList)){
mDrawerLayout.closeDrawer(mDrawerList);
} else {
createOptionsMenuAsDrawer(true);
}
}
public void createOptionsMenuAsDrawer(boolean show){
final ContextMenuAdapter cm = createOptionsMenu();
final DrawerLayout mDrawerLayout = (DrawerLayout) mapActivity.findViewById(R.id.drawer_layout);
final ListView mDrawerList = (ListView) mapActivity.findViewById(R.id.left_drawer);
mDrawerLayout = (DrawerLayout) mapActivity.findViewById(R.id.drawer_layout);
mDrawerList = (ListView) mapActivity.findViewById(R.id.left_drawer);
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
ListAdapter listAdapter;
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB){