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 2015-02-04 21:36:24 +01:00
commit 5b3d96fdf7
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="osmo">OsMo</string>
<string name="edit_group">Edit group</string>
<string name="parking_place">Parking place</string>
<string name="remove_the_tag">REMOVE THE TAG</string>

11
OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
View file

@ -9,7 +9,6 @@ import android.support.v4.view.MenuItemCompat;
import android.support.v7.view.ActionMode;
import android.view.*;
import gnu.trove.list.array.TIntArrayList;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
@ -18,7 +17,6 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.osmand.AndroidUtils;
import net.osmand.Location;
import net.osmand.access.AccessibleToast;
@ -42,6 +40,7 @@ import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoDevice;
import net.osmand.plus.osmo.OsMoGroupsStorage.OsMoGroup;
import net.osmand.plus.osmo.OsMoService.SessionInfo;
import net.osmand.util.MapUtils;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.content.Context;
@ -128,7 +127,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
// This has to be called before setContentView and you must use the
//TODO: remove this deprecated code with toolbar
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
getWindow().setUiOptions(ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
setWindowOptionsDeprecated();
}
super.onCreate(icicle);
app = (OsmandApplication) getApplication();
@ -174,6 +173,12 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
});
}
@SuppressLint("NewApi")
private void setWindowOptionsDeprecated() {
getWindow().setUiOptions(
ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
}
private void setupHeader() {
header = getLayoutInflater().inflate(R.layout.osmo_groups_list_header, null);
getExpandableListView().addHeaderView(header);