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-03-18 13:29:27 +01:00
commit 9f255cd6b3
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
android:layout_height="fill_parent">
<ImageButton
android:id="@+id/map_menu_button"

22
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -33,8 +33,6 @@ import android.util.DisplayMetrics;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroup.MarginLayoutParams;
import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.view.animation.TranslateAnimation;
@ -101,8 +99,9 @@ public class DashboardOnMap {
scrollView = ((NotifyingScrollView) dashboardView.findViewById(R.id.main_scroll));
listViewLayout = dashboardView.findViewById(R.id.dash_list_view_layout);
listView = (ListView) dashboardView.findViewById(R.id.dash_list_view);
// dashboardView.setOnClickListener(listener);
dashboardView.findViewById(R.id.animateContent).setOnClickListener(listener);
dashboardView.setOnClickListener(listener);
dashboardView.findViewById(R.id.map_part_dashboard).setOnClickListener(listener);
actionButton = new ActionButton(mapActivity);
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@ -322,13 +321,20 @@ public class DashboardOnMap {
mapActivity.startActivity(intent);
}
});
scheduleDownloadButtonCheck();
}
private void scheduleDownloadButtonCheck() {
mapActivity.getMyApplication().runInUIThread(new Runnable() {
@Override
public void run() {
if(isVisible()) {
updateDownloadBtn();
}
}
}, 4000);
}
public void navigationAction() {