Update landscape layout

This commit is contained in:
Victor Shcherb 2015-04-23 01:10:08 +02:00
parent 63490cbfd7
commit b4a6beee0c

View file

@ -5,18 +5,11 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="horizontal" > android:orientation="horizontal" >
<!-- PREPARATION SCREEN -->
<include layout="@layout/map_route_prepare_bottom"
android:layout_width="@dimen/map_route_planning_land_width"
android:layout_height="@dimen/map_route_buttons_height"
android:layout_gravity="bottom"/>
<FrameLayout <FrameLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left" >
>
<!-- ALARM --> <!-- ALARM -->
<FrameLayout <FrameLayout
@ -44,6 +37,7 @@
android:textSize="@dimen/map_alarm_text_size" android:textSize="@dimen/map_alarm_text_size"
android:textStyle="bold" /> android:textStyle="bold" />
</FrameLayout> </FrameLayout>
<!-- SHADOW --> <!-- SHADOW -->
<FrameLayout <FrameLayout
@ -75,26 +69,41 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left" >
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:orientation="horizontal" >
<ImageButton <!-- PREPARATION SCREEN -->
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
<ImageButton <include
android:id="@+id/map_route_info_button" android:layout_width="@dimen/map_route_planning_land_width"
android:layout_width="@dimen/map_button_size" android:layout_height="@dimen/map_route_buttons_height"
android:layout_height="@dimen/map_button_size" android:layout_gravity="bottom|left"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:visibility="gone"
android:background="@drawable/btn_round" layout="@layout/map_route_prepare_bottom" />
android:src="@drawable/ic_action_test_light" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:orientation="horizontal" >
<ImageButton
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
<ImageButton
android:id="@+id/map_route_info_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:background="@drawable/btn_round"
android:src="@drawable/ic_action_test_light" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
@ -114,29 +123,28 @@
android:layout_gravity="bottom" > android:layout_gravity="bottom" >
<FrameLayout <FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="@dimen/map_ruler_bottom_margin" >
<TextView
android:id="@+id/map_ruler_text_shadow"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginBottom="@dimen/map_ruler_bottom_margin" > android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
<TextView <TextView
android:id="@+id/map_ruler_text_shadow" android:id="@+id/map_ruler_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="100 m" android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" /> android:textSize="@dimen/map_widget_text_size_small" />
</FrameLayout>
<TextView
android:id="@+id/map_ruler_text"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:text="100 m"
android:textSize="@dimen/map_widget_text_size_small" />
</FrameLayout>
<ImageView <ImageView
android:id="@+id/map_ruler_image" android:id="@+id/map_ruler_image"
@ -247,6 +255,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>