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 2014-12-02 14:51:01 +01:00
commit 15f63ca120
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
View file

@ -44,6 +44,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
settings = ((OsmandApplication) getApplication()).getSettings();
if(downloadListIndexThread == null) { if(downloadListIndexThread == null) {
downloadListIndexThread = new DownloadIndexesThread(this); downloadListIndexThread = new DownloadIndexesThread(this);
} }

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

@ -74,8 +74,7 @@ public class DownloadActivity extends BaseDownloadActivity {
setProgressBarIndeterminateVisibility(false); setProgressBarIndeterminateVisibility(false);
setContentView(R.layout.tab_content); setContentView(R.layout.tab_content);
settings = ((OsmandApplication) getApplication()).getSettings();
tabHost = (TabHost) findViewById(android.R.id.tabhost); tabHost = (TabHost) findViewById(android.R.id.tabhost);
tabHost.setup(); tabHost.setup();
ViewPager viewPager = (ViewPager) findViewById(R.id.pager); ViewPager viewPager = (ViewPager) findViewById(R.id.pager);