Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge

Browse source
This commit is contained in:
GaidamakUA 2015-10-21 17:23:24 +03:00
commit 18369871ef
5 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/res/values-da/phrases.xml
View file

@ -2251,4 +2251,19 @@
<string name="poi_cairn">Varde</string>
<string name="poi_memorial_fassade_decoration">Fassade dekoration</string>
<string name="poi_defibrillator">Defibrillator</string>
<string name="poi_defibrillator_yes">Defibrillator: Ja</string>
<string name="poi_tomb_war_grave">Type: krigsgrav</string>
<string name="poi_tomb_tumulus">Type: gravhøj</string>
<string name="poi_tomb_rock_cut">Type: udhugget i sten</string>
<string name="poi_tomb_hypogeum">Type: hypogeum</string>
<string name="poi_tomb_vault">Type: hvælving</string>
<string name="poi_tomb_columbarium">Type: columbarium</string>
<string name="poi_tomb_mausoleum">Type: mausoleum</string>
<string name="poi_tomb_sarcophagus">Type: sarkofag</string>
<string name="poi_tomb_crypt">Type: krypt</string>
<string name="poi_tomb_pyramid">Type: pyramide</string>
</resources>

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

@ -100,7 +100,8 @@
<dimen name="dash_margin">2dp</dimen>
<dimen name="dash_margin_h">6dp</dimen>
<dimen name="fab_size_with_shadow">62dp</dimen>
<!-- TextSizes -->
<dimen name="default_list_text_size_large">19sp</dimen>

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

@ -74,8 +74,9 @@ public class DownloadActivity extends BaseDownloadActivity {
final View downloadProgressLayout = findViewById(R.id.downloadProgressLayout);
downloadProgressLayout.setVisibility(View.VISIBLE);
updateDescriptionTextWithSize(this, downloadProgressLayout);
int currentTab = 0;
int currentTab = DOWNLOAD_TAB_NUMBER;
String tab = getIntent() == null || getIntent().getExtras() == null ? null : getIntent().getExtras().getString(TAB_TO_OPEN);
if (tab != null) {
switch (tab) {
case DOWNLOAD_TAB:
@ -88,8 +89,6 @@ public class DownloadActivity extends BaseDownloadActivity {
currentTab = UPDATES_TAB_NUMBER;
break;
}
} else {
currentTab = DOWNLOAD_TAB_NUMBER;
}
viewPager = (ViewPager) findViewById(R.id.pager);

2
OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
View file

@ -1060,7 +1060,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
if (child.getSize() > 100) {
builder.append(DownloadActivity.formatMb.format(new Object[]{(float) child.getSize() / (1 << 10)}));
} else {
builder.append(child.getSize()).append(" kB");
builder.append(child.getSize()).append(" KB");
}
builder.append(" • ");
}

1
eclipse-compile/design/src/main/res/values/dimens.xml
View file

@ -22,7 +22,6 @@
<dimen name="fab_size_normal">56dp</dimen>
<dimen name="fab_size_mini">40dp</dimen>
<dimen name="fab_border_width">0.5dp</dimen>
<dimen name="fab_size_with_shadow">62dp</dimen>
<dimen name="navigation_max_width">320dp</dimen>
<dimen name="navigation_elevation">12dp</dimen>