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).
nightly-build-test
ValentinTimisica 5 years ago committed by Tiger Oakes
parent 6de7b7d733
commit bdb2fa71fc

@ -18,7 +18,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableStart="@drawable/mozac_ic_back" android:drawableStart="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:text="@string/create_collection_select_tabs" android:text="@string/create_collection_select_tabs"
android:textAppearance="@style/HeaderTextStyle" android:textAppearance="@style/HeaderTextStyle"

@ -18,7 +18,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableStart="@drawable/mozac_ic_back" android:drawableStart="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:text="@string/create_collection_name_collection" android:text="@string/create_collection_name_collection"
android:textAppearance="@style/HeaderTextStyle" android:textAppearance="@style/HeaderTextStyle"

@ -19,7 +19,7 @@
android:drawableStart="@drawable/mozac_ic_back" android:drawableStart="@drawable/mozac_ic_back"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:drawableTint="@color/neutral_text" app:drawableTint="@color/neutral_text"
android:text="@string/create_collection_select_collection" android:text="@string/create_collection_select_collection"
android:textAppearance="@style/HeaderTextStyle" android:textAppearance="@style/HeaderTextStyle"
android:textColor="@color/neutral_text" android:textColor="@color/neutral_text"

@ -45,7 +45,7 @@
android:drawableStart="@drawable/ic_info" android:drawableStart="@drawable/ic_info"
android:text="@string/sync_add_new_device_message" android:text="@string/sync_add_new_device_message"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="@color/sync_error_text_color" app:drawableTint="@color/sync_error_text_color"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/sync_error_text_color" android:textColor="@color/sync_error_text_color"

@ -78,9 +78,9 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:drawableStart="@drawable/ic_folder_icon" android:drawableStart="@drawable/ic_folder_icon"
android:drawablePadding="10dp" android:drawablePadding="10dp"
app:drawableTint="?primaryText"
android:textColor="?secondaryText" android:textColor="?secondaryText"
android:textSize="16sp" android:textSize="16sp"
app:drawableTint="?primaryText"
tools:text="Mobile Bookmarks" /> tools:text="Mobile Bookmarks" />
</LinearLayout> </LinearLayout>

@ -4,6 +4,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/no_content_wrapper" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/no_content_wrapper"
android:background="@drawable/empty_session_control_background" android:background="@drawable/empty_session_control_background"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
@ -16,7 +17,7 @@
android:id="@+id/no_content_header" android:id="@+id/no_content_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTint="?primaryText" app:drawableTint="?primaryText"
android:drawablePadding="8dp" android:drawablePadding="8dp"
tools:text="@tools:sample/lorem" tools:text="@tools:sample/lorem"
tools:drawableEnd="@drawable/ic_tab_collection" tools:drawableEnd="@drawable/ic_tab_collection"

Loading…
Cancel
Save