From 5f3e255426e2c78a9a9e0d55939093d0b0a25ceb Mon Sep 17 00:00:00 2001 From: Colin Lee Date: Mon, 15 Apr 2019 12:26:59 -0500 Subject: [PATCH] No issue: fix build breakage on merge --- .../main/res/layout/fragment_site_permissions_exceptions.xml | 2 +- .../res/layout/fragment_site_permissions_exceptions_item.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml index f6453fb25..a0b93e4a6 100644 --- a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml +++ b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml @@ -39,7 +39,7 @@ android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/toolbarTextColor" + android:textColor="?primaryText" android:textSize="20sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml index 8f93d06d5..500f7bbcf 100644 --- a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml +++ b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml @@ -11,7 +11,7 @@ android:textSize="@dimen/site_permissions_exceptions_item_text_size" android:drawablePadding="16dp" android:drawableStart="@drawable/ic_internet" - android:textColor="?attr/toolbarTextColor" + android:textColor="?primaryText" android:gravity="start|center_vertical" android:paddingStart="24dp" android:paddingEnd="24dp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e800cfc91..6af85aee2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -84,7 +84,7 @@