Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Marchuk <alexm@maps.me>2015-09-22 16:20:20 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:06:50 +0300
commit948ec1575782df3db47e03276e8a57405e4e0438 (patch)
tree360f33edfacdc0981c592e2a050063b97916e96d
parent60fc02cd68ce10f2dd1d64263a0917cdb14cf171 (diff)
[android] fix: Image in "update map" dialog can be collapsed if not fit.
-rw-r--r--android/res/layout/dialog_new_style.xml59
1 files changed, 31 insertions, 28 deletions
diff --git a/android/res/layout/dialog_new_style.xml b/android/res/layout/dialog_new_style.xml
index 4c33abe14e..8a819db3a4 100644
--- a/android/res/layout/dialog_new_style.xml
+++ b/android/res/layout/dialog_new_style.xml
@@ -1,33 +1,36 @@
-<LinearLayout
+<com.mapswithme.maps.widget.HeightLimitedFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="@dimen/margin_base_plus">
-
- <TextView
- android:id="@+id/tv__title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/update_maps_alert_title"
- android:textAppearance="@style/MwmTextAppearance.Title"
- android:textStyle="bold"/>
-
- <ImageView
- android:id="@+id/iv__image"
+ android:layout_height="match_parent">
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="@dimen/margin_half_plus"
- android:contentDescription="@null"
- android:src="@drawable/ic_img_new_style_map"/>
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="@dimen/margin_base_plus">
+ <TextView
+ android:id="@+id/tv__title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/update_maps_alert_title"
+ android:textAppearance="@style/MwmTextAppearance.Title"
+ android:textStyle="bold"/>
- <TextView
- android:id="@+id/tv__text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/margin_half_plus"
- android:text="@string/update_maps_alert_message"
- android:textAppearance="@style/MwmTextAppearance.Body2"/>
+ <ImageView
+ android:id="@+id/iv__image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="@dimen/margin_half_plus"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_img_new_style_map"
+ android:tag="@string/tag_height_limited"/>
-</LinearLayout> \ No newline at end of file
+ <TextView
+ android:id="@+id/tv__text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/margin_half_plus"
+ android:text="@string/update_maps_alert_message"
+ android:textAppearance="@style/MwmTextAppearance.Body2"/>
+ </LinearLayout>
+</com.mapswithme.maps.widget.HeightLimitedFrameLayout> \ No newline at end of file