From f96866c45091173da9f3a8fbd194846c9ce52395 Mon Sep 17 00:00:00 2001 From: Nazar-Kutz Date: Tue, 19 May 2020 12:02:51 +0300 Subject: [PATCH] Fix AutoCompleteTextView crashes --- OsmAnd/res/layout/fragment_edit_poi.xml | 6 +++--- OsmAnd/res/layout/point_editor_fragment.xml | 4 ++-- OsmAnd/res/layout/quick_action_add_favorite.xml | 6 +++--- OsmAnd/res/layout/quick_action_add_gpx.xml | 6 +++--- OsmAnd/res/layout/quick_action_add_poi_layout.xml | 6 +++--- OsmAnd/res/layout/subscription_fragment.xml | 6 +++--- .../net/osmand/plus/widgets/AutoCompleteTextViewEx.java | 8 +------- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml index 30d2261406..b93c6743f5 100644 --- a/OsmAnd/res/layout/fragment_edit_poi.xml +++ b/OsmAnd/res/layout/fragment_edit_poi.xml @@ -95,12 +95,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:completionThreshold="1" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:importantForAutofill="noExcludeDescendants" android:imeOptions="actionSend" android:inputType="text" - tools:text="@string/lorem_ipsum" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + tools:text="@string/lorem_ipsum" /> diff --git a/OsmAnd/res/layout/point_editor_fragment.xml b/OsmAnd/res/layout/point_editor_fragment.xml index 561043aba0..216ea4b75b 100644 --- a/OsmAnd/res/layout/point_editor_fragment.xml +++ b/OsmAnd/res/layout/point_editor_fragment.xml @@ -169,9 +169,9 @@ android:layout_marginLeft="@dimen/content_padding_half" android:layout_marginRight="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding_half" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" android:layout_marginEnd="@dimen/content_padding" android:layout_marginStart="@dimen/content_padding_half" /> diff --git a/OsmAnd/res/layout/quick_action_add_favorite.xml b/OsmAnd/res/layout/quick_action_add_favorite.xml index 0fdcad888f..8739da7579 100644 --- a/OsmAnd/res/layout/quick_action_add_favorite.xml +++ b/OsmAnd/res/layout/quick_action_add_favorite.xml @@ -195,11 +195,11 @@ android:layout_marginTop="@dimen/content_padding_half" android:focusable="false" android:text="@string/shared_string_favorites" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" android:layout_marginEnd="@dimen/content_padding" - android:layout_marginStart="@dimen/content_padding_half" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:layout_marginStart="@dimen/content_padding_half" /> diff --git a/OsmAnd/res/layout/quick_action_add_gpx.xml b/OsmAnd/res/layout/quick_action_add_gpx.xml index 3ecb76c9be..0114d17b36 100644 --- a/OsmAnd/res/layout/quick_action_add_gpx.xml +++ b/OsmAnd/res/layout/quick_action_add_gpx.xml @@ -194,12 +194,12 @@ android:layout_marginRight="@dimen/content_padding" android:layout_marginTop="@dimen/content_padding_half" android:focusable="false" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:text="@string/shared_string_favorites" - android:drawableRight="@drawable/ic_action_arrow_drop_down" android:editable="false" android:layout_marginStart="@dimen/content_padding_half" - android:layout_marginEnd="@dimen/content_padding" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:layout_marginEnd="@dimen/content_padding" /> diff --git a/OsmAnd/res/layout/quick_action_add_poi_layout.xml b/OsmAnd/res/layout/quick_action_add_poi_layout.xml index a5731f30d6..9ef2b0e03d 100644 --- a/OsmAnd/res/layout/quick_action_add_poi_layout.xml +++ b/OsmAnd/res/layout/quick_action_add_poi_layout.xml @@ -89,14 +89,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:completionThreshold="1" - android:drawableTint="@color/osmand_orange" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + osmand:drawableTint="@color/osmand_orange" + osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + osmand:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:hint="@string/poi_dialog_poi_type" android:imeOptions="actionSend" android:inputType="text" android:layout_marginLeft="-4dp" tools:text="@string/lorem_ipsum" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" android:layout_marginStart="-4dp" /> diff --git a/OsmAnd/res/layout/subscription_fragment.xml b/OsmAnd/res/layout/subscription_fragment.xml index a195b8d4b8..59b6f9b1b8 100644 --- a/OsmAnd/res/layout/subscription_fragment.xml +++ b/OsmAnd/res/layout/subscription_fragment.xml @@ -179,14 +179,14 @@ android:id="@+id/selectCountryEdit" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:drawableRight="@drawable/ic_action_arrow_drop_down" + app:drawableRightCompat="@drawable/ic_action_arrow_drop_down" + app:drawableEndCompat="@drawable/ic_action_arrow_drop_down" android:editable="false" android:paddingLeft="2dp" android:paddingRight="0dp" android:text="Ukraine" android:paddingStart="2dp" - android:paddingEnd="0dp" - android:drawableEnd="@drawable/ic_action_arrow_drop_down" /> + android:paddingEnd="0dp" />