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

Merge pull request #6486 from osmandapp/kolomiets_branch

Browse source 
Kolomiets branch
This commit is contained in:
Alexey 2019-01-30 15:01:49 +03:00 committed by GitHub
commit d2defcf498
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/layout-land/map_hud_bottom.xml
View file

@ -183,14 +183,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"/> android:layout_gravity="center"/>
<ImageButton
android:id="@+id/map_transparency_hide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/btn_circle_transparent"
android:contentDescription="@string/shared_string_hide"
android:src="@drawable/headliner_close"/>
</LinearLayout> </LinearLayout>
<ProgressBar <ProgressBar

8
OsmAnd/res/layout/map_hud_bottom.xml
View file

@ -103,14 +103,6 @@
android:paddingLeft="6dp" android:paddingLeft="6dp"
android:paddingRight="6dp"/> android:paddingRight="6dp"/>
<ImageButton
android:id="@+id/map_transparency_hide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/btn_circle_transparent"
android:contentDescription="@string/shared_string_hide"
android:src="@drawable/headliner_close"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

1
OsmAnd/src/net/osmand/plus/resources/IncrementalChangesManager.java
View file

@ -299,6 +299,7 @@ public class IncrementalChangesManager {
XmlPullParserException { XmlPullParserException {
String url = URL + "?aosmc=true&timestamp=" + timestamp + "&file=" + URLEncoder.encode(file); String url = URL + "?aosmc=true&timestamp=" + timestamp + "&file=" + URLEncoder.encode(file);
HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url); HttpURLConnection conn = NetworkUtils.getHttpURLConnection(url);
conn.setUseCaches(false);
XmlPullParser parser = PlatformUtil.newXMLPullParser(); XmlPullParser parser = PlatformUtil.newXMLPullParser();
parser.setInput(conn.getInputStream(), "UTF-8"); parser.setInput(conn.getInputStream(), "UTF-8");
List<IncrementalUpdate> lst = new ArrayList<IncrementalUpdate>(); List<IncrementalUpdate> lst = new ArrayList<IncrementalUpdate>();

9
OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
View file

@ -925,15 +925,6 @@ public class MapControlsLayer extends OsmandMapLayer {
} }
} }
}); });
ImageButton imageButton = (ImageButton) mapActivity.findViewById(R.id.map_transparency_hide);
imageButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
transparencyBarLayout.setVisibility(View.GONE);
settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.set(LayerTransparencySeekbarMode.OFF);
hideTransparencyBar(transparencySetting);
}
});
LayerTransparencySeekbarMode seekbarMode = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get(); LayerTransparencySeekbarMode seekbarMode = settings.LAYER_TRANSPARENCY_SEEKBAR_MODE.get();
if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) { if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {