diff options
author | Dmitry Yunitsky <yunik@mapswithme.com> | 2015-03-26 21:07:11 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:41:08 +0300 |
commit | 9f39b6132fff559671c4ad989f450c712b93f990 (patch) | |
tree | 16233759b0ecb1248f5c2329739e0da50584eab8 /android/res/layout | |
parent | f62bde00575baee30b417f84832b1eb2c1b7ee7c (diff) |
Fixes for 2.3 devices(used simple layout without any animations).
Diffstat (limited to 'android/res/layout')
-rw-r--r-- | android/res/layout/place_page.xml | 43 | ||||
-rw-r--r-- | android/res/layout/place_page_details.xml | 2 | ||||
-rw-r--r-- | android/res/layout/place_page_details_common.xml | 1 |
3 files changed, 15 insertions, 31 deletions
diff --git a/android/res/layout/place_page.xml b/android/res/layout/place_page.xml index c2c201d053..faa99c39b2 100644 --- a/android/res/layout/place_page.xml +++ b/android/res/layout/place_page.xml @@ -1,29 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <include - android:id="@+id/pp__preview" - layout="@layout/place_page_preview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/pp__buttons"/> - - <include - android:id="@+id/pp__details" - layout="@layout/place_page_details" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_above="@+id/pp__buttons" - android:layout_marginTop="56dp"/> + android:orientation="vertical"> - <View - android:id="@+id/view_bottom_white" - android:layout_width="match_parent" - android:layout_height="@dimen/place_page_buttons_height" - android:layout_alignParentBottom="true" - android:background="@color/bg_top_panels" - android:visibility="gone"/> + <include + android:id="@+id/pp__preview" + layout="@layout/place_page_preview" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <include + android:id="@+id/pp__details" + layout="@layout/place_page_details"/> + + </LinearLayout> <include android:id="@+id/pp__buttons" @@ -32,13 +26,4 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true"/> - <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="@color/base_green" - android:visibility="gone" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - app:theme="@style/MwmToolbar"/> - </merge>
\ No newline at end of file diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index f87f7af9c5..75ed641fc2 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:background="@color/bg_top_panels" android:overScrollMode="never"> diff --git a/android/res/layout/place_page_details_common.xml b/android/res/layout/place_page_details_common.xml index 54bb02bc12..77435c0969 100644 --- a/android/res/layout/place_page_details_common.xml +++ b/android/res/layout/place_page_details_common.xml @@ -5,7 +5,6 @@ android:id="@+id/rl__place_details" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/bg_top_panels" android:orientation="vertical" android:paddingLeft="@dimen/margin_medium_and_half" android:paddingRight="@dimen/margin_medium_and_half" |