Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-01 12:49:41 +02:00
commit 2d87bb8ec4
3 changed files with 10 additions and 6 deletions

View file

@ -66,6 +66,6 @@
android:layout_width="280dp" android:layout_width="280dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="left" android:layout_gravity="left"
android:background="@color/dashboard_background"/> android:background="?attr/bg_color"/>
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>

View file

@ -1,14 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="24dp" android:drawablePadding="24dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="16dp" android:padding="16dp"
android:text="@string/layer_poi" android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size_large" android:textSize="@dimen/default_desc_text_size"
tools:drawableLeft="@drawable/ic_action_search_dark"/> osmand:typeface="@string/font_roboto_medium"
tools:drawableLeft="@drawable/ic_action_search_dark"
tools:text="@string/layer_poi"/>

View file

@ -232,7 +232,8 @@ public class MapActivity extends AccessibleActivity {
final ListView menuItemsListView = (ListView) findViewById(R.id.menuItems); final ListView menuItemsListView = (ListView) findViewById(R.id.menuItems);
menuItemsListView.setDivider(null); menuItemsListView.setDivider(null);
final ContextMenuAdapter contextMenuAdapter = mapActions.createMainOptionsMenu(); final ContextMenuAdapter contextMenuAdapter = mapActions.createMainOptionsMenu();
final ArrayAdapter<?> simpleListAdapter = contextMenuAdapter.createSimpleListAdapter(this, true); final ArrayAdapter<?> simpleListAdapter = contextMenuAdapter.createSimpleListAdapter(this,
settings.OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME);
menuItemsListView.setAdapter(simpleListAdapter); menuItemsListView.setAdapter(simpleListAdapter);
menuItemsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { menuItemsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override @Override