Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
15f63ca120
2 changed files with 2 additions and 2 deletions
|
@ -44,6 +44,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
|
|||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
settings = ((OsmandApplication) getApplication()).getSettings();
|
||||
if(downloadListIndexThread == null) {
|
||||
downloadListIndexThread = new DownloadIndexesThread(this);
|
||||
}
|
||||
|
|
|
@ -74,8 +74,7 @@ public class DownloadActivity extends BaseDownloadActivity {
|
|||
setProgressBarIndeterminateVisibility(false);
|
||||
|
||||
setContentView(R.layout.tab_content);
|
||||
|
||||
settings = ((OsmandApplication) getApplication()).getSettings();
|
||||
|
||||
tabHost = (TabHost) findViewById(android.R.id.tabhost);
|
||||
tabHost.setup();
|
||||
ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
|
||||
|
|
Loading…
Reference in a new issue