From bdb2fa71fc3616ead6eaaee0ce46d80270e4dbc1 Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Thu, 24 Oct 2019 19:38:58 +0300 Subject: [PATCH] For #6145: Switch drawableTint to app compat version. (#6151) The property android:drawableTint doesn't work on older Android devices, so I switched to the appcompat version (app:drawableTint). --- .../res/layout/component_collection_creation.xml | 2 +- ...mponent_collection_creation_name_collection.xml | 2 +- ...onent_collection_creation_select_collection.xml | 2 +- .../main/res/layout/fragment_add_new_device.xml | 2 +- app/src/main/res/layout/fragment_edit_bookmark.xml | 14 +++++++------- app/src/main/res/layout/no_content_message.xml | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index 6cd864298..67f7ee1c1 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -18,7 +18,7 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:drawableStart="@drawable/mozac_ic_back" android:drawablePadding="8dp" - android:drawableTint="@color/neutral_text" + app:drawableTint="@color/neutral_text" android:gravity="start|center_vertical" android:text="@string/create_collection_select_tabs" android:textAppearance="@style/HeaderTextStyle" diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml index cf47986f1..55604703f 100644 --- a/app/src/main/res/layout/component_collection_creation_name_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_name_collection.xml @@ -18,7 +18,7 @@ android:background="?android:attr/selectableItemBackgroundBorderless" android:drawableStart="@drawable/mozac_ic_back" android:drawablePadding="8dp" - android:drawableTint="@color/neutral_text" + app:drawableTint="@color/neutral_text" android:gravity="start|center_vertical" android:text="@string/create_collection_name_collection" android:textAppearance="@style/HeaderTextStyle" diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml index 4e9fe58f5..b53132bbd 100644 --- a/app/src/main/res/layout/component_collection_creation_select_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml @@ -19,7 +19,7 @@ android:drawableStart="@drawable/mozac_ic_back" android:drawablePadding="8dp" android:gravity="start|center_vertical" - android:drawableTint="@color/neutral_text" + app:drawableTint="@color/neutral_text" android:text="@string/create_collection_select_collection" android:textAppearance="@style/HeaderTextStyle" android:textColor="@color/neutral_text" diff --git a/app/src/main/res/layout/fragment_add_new_device.xml b/app/src/main/res/layout/fragment_add_new_device.xml index 36234cd97..e29bf14ca 100644 --- a/app/src/main/res/layout/fragment_add_new_device.xml +++ b/app/src/main/res/layout/fragment_add_new_device.xml @@ -45,7 +45,7 @@ android:drawableStart="@drawable/ic_info" android:text="@string/sync_add_new_device_message" android:drawablePadding="8dp" - android:drawableTint="@color/sync_error_text_color" + app:drawableTint="@color/sync_error_text_color" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/sync_error_text_color" diff --git a/app/src/main/res/layout/fragment_edit_bookmark.xml b/app/src/main/res/layout/fragment_edit_bookmark.xml index 305d87669..a8b02b89d 100644 --- a/app/src/main/res/layout/fragment_edit_bookmark.xml +++ b/app/src/main/res/layout/fragment_edit_bookmark.xml @@ -3,12 +3,12 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_margin="16dp" + android:orientation="vertical"> diff --git a/app/src/main/res/layout/no_content_message.xml b/app/src/main/res/layout/no_content_message.xml index 5f2caae95..ddc4dcb15 100644 --- a/app/src/main/res/layout/no_content_message.xml +++ b/app/src/main/res/layout/no_content_message.xml @@ -4,6 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->