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-10-22 01:04:04 +02:00
commit 78f3c97e8e
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -445,10 +445,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
} }
audioNotesLayer = new AudioNotesLayer(activity, this); audioNotesLayer = new AudioNotesLayer(activity, this);
activity.getMapView().addLayer(audioNotesLayer, 3.5f); activity.getMapView().addLayer(audioNotesLayer, 3.5f);
if (recordControl == null) {
registerWidget(activity); registerWidget(activity);
} }
}
private void registerMediaListener(AudioManager am) { private void registerMediaListener(AudioManager am) {

8
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -296,7 +296,6 @@ public class DownloadActivity extends BaseDownloadActivity {
|| application.getSettings().SHOULD_SHOW_FREE_VERSION_BANNER.get(); || application.getSettings().SHOULD_SHOW_FREE_VERSION_BANNER.get();
initFreeVersionBanner(); initFreeVersionBanner();
updateFreeVersionBanner();
updateBannerInProgress(); updateBannerInProgress();
if (ctx.getCurrentTab() != UPDATES_TAB_NUMBER) { if (ctx.getCurrentTab() != UPDATES_TAB_NUMBER) {
@ -305,13 +304,17 @@ public class DownloadActivity extends BaseDownloadActivity {
} }
public void updateBannerInProgress() { public void updateBannerInProgress() {
updateBannerInProgress(true);
}
public void updateBannerInProgress(boolean showSpace) {
BasicProgressAsyncTask<?, ?, ?, ?> basicProgressAsyncTask = ctx.getDownloadThread().getCurrentRunningTask(); BasicProgressAsyncTask<?, ?, ?, ?> basicProgressAsyncTask = ctx.getDownloadThread().getCurrentRunningTask();
final boolean isFinished = basicProgressAsyncTask == null final boolean isFinished = basicProgressAsyncTask == null
|| basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED; || basicProgressAsyncTask.getStatus() == AsyncTask.Status.FINISHED;
if (isFinished) { if (isFinished) {
downloadProgressLayout.setOnClickListener(null); downloadProgressLayout.setOnClickListener(null);
updateDescriptionTextWithSize(ctx, downloadProgressLayout); updateDescriptionTextWithSize(ctx, downloadProgressLayout);
if (ctx.getCurrentTab() == UPDATES_TAB_NUMBER) { if (ctx.getCurrentTab() == UPDATES_TAB_NUMBER || !showSpace) {
downloadProgressLayout.setVisibility(View.GONE); downloadProgressLayout.setVisibility(View.GONE);
} }
updateFreeVersionBanner(); updateFreeVersionBanner();
@ -373,6 +376,7 @@ public class DownloadActivity extends BaseDownloadActivity {
}); });
laterButton.setOnClickListener(new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView, laterButton.setOnClickListener(new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView,
buttonsLinearLayout, freeVersionBannerTitle, application.getSettings())); buttonsLinearLayout, freeVersionBannerTitle, application.getSettings()));
updateFreeVersionBanner();
} }
private void updateFreeVersionBanner() { private void updateFreeVersionBanner() {

6
OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
View file

@ -153,7 +153,7 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
@Override @Override
public void newDownloadIndexes() { public void newDownloadIndexes() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
reloadData(); reloadData();
} }
@ -161,7 +161,7 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
@Override @Override
public void downloadHasFinished() { public void downloadHasFinished() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }
@ -169,7 +169,7 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
@Override @Override
public void downloadInProgress() { public void downloadInProgress() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }

6
OsmAnd/src/net/osmand/plus/download/ui/SearchDialogFragment.java
View file

@ -151,7 +151,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
@Override @Override
public void newDownloadIndexes() { public void newDownloadIndexes() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
updateSearchText(searchText); updateSearchText(searchText);
} }
@ -159,7 +159,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
@Override @Override
public void downloadHasFinished() { public void downloadHasFinished() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }
@ -167,7 +167,7 @@ public class SearchDialogFragment extends DialogFragment implements DownloadEven
@Override @Override
public void downloadInProgress() { public void downloadInProgress() {
if(banner != null) { if(banner != null) {
banner.updateBannerInProgress(); banner.updateBannerInProgress(false);
} }
listAdapter.notifyDataSetChanged(); listAdapter.notifyDataSetChanged();
} }