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 2016-06-06 17:54:52 +02:00
commit ab9d9d4299
1 changed files with 222 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="bottom"
android:layout_gravity="bottom"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="bottom"
android:orientation="horizontal">
@ -10,7 +19,7 @@
android:id="@+id/bottom_left_views"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/move_marker_bottom_sheet"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true">
<!-- ALARM -->
@ -97,15 +106,21 @@
</FrameLayout>
<!-- RIGHT BUTTONS -->
<android.support.v4.widget.Space
android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="@dimen/map_button_margin"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
<ImageButton
android:id="@+id/map_zoom_out_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_alignBottom="@id/bottom_left_views"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_above="@id/space"
android:layout_marginRight="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:layout_toLeftOf="@id/space"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomOut"
tools:src="@drawable/ic_action_test_light"/>
@ -114,8 +129,7 @@
android:id="@+id/map_my_location_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_alignBottom="@id/bottom_left_views"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_alignBottom="@id/map_zoom_out_button"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:layout_toLeftOf="@id/map_zoom_out_button"
@ -141,7 +155,8 @@
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_toLeftOf="@id/map_my_location_button"
android:layout_toRightOf="@id/bottom_left_views"
android:layout_weight="1">
android:layout_weight="1"
tools:visibility="gone">
<!-- RULER -->
@ -244,11 +259,10 @@
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
</RelativeLayout>
<include
layout="@layout/move_marker_bottom_sheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
</RelativeLayout>
android:layout_height="wrap_content"/>
</LinearLayout>