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 11:21:16 +01:00
commit 6fe3907238
7 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/AndroidManifest.xml
View file

@ -61,7 +61,6 @@
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter>

2
OsmAnd/res/layout/download.xml
View file

@ -8,7 +8,7 @@
<net.osmand.plus.views.controls.PagerSlidingTabStrip
android:id="@+id/sliding_tabs"
android:layout_width="fill_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/tab_height"
android:background="?attr/colorPrimary" />
<LinearLayout

2
OsmAnd/res/layout/tab_content.xml
View file

@ -7,7 +7,7 @@
<net.osmand.plus.views.controls.PagerSlidingTabStrip
android:id="@+id/sliding_tabs"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/tab_height"
android:background="?attr/colorPrimary"/>
<android.support.v4.view.ViewPager

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

@ -24,6 +24,7 @@
<dimen name="dash_parking_height">100dp</dimen>
<dimen name="list_content_padding">16dp</dimen>
<dimen name="list_header_padding">8dp</dimen>
<dimen name="tab_height">48dp</dimen>
<!-- TextSizes -->
<dimen name="showAllButtonTextSize">12sp</dimen>

2
OsmAnd/src/net/osmand/plus/activities/AvailableGPXFragment.java
View file

@ -133,7 +133,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
| MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);

2
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -299,7 +299,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
searchView = new SearchView(getActivity());

1
OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
View file

@ -243,6 +243,7 @@ public class SelectedGPXFragment extends OsmandExpandableListFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
menu.clear();
((FavoritesActivity) getActivity()).getClearToolbar(false);
// MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_light,
// R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS