diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
6 files changed, 6 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index ea20b77b3..9557bf61e 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -29,7 +29,7 @@ android:minHeight="?attr/actionBarSize" android:background="?attr/colorPrimary" android:overScrollMode="always" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" android:transitionGroup="false" diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index 45df0df71..e65969227 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -13,7 +13,7 @@ android:elevation="4dp" android:background="?attr/colorPrimary" android:minHeight="?attr/actionBarSize" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml index 8b043861f..9a9738825 100644 --- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml @@ -162,15 +162,13 @@ <Button android:id="@+id/nfc_activity_3_error_try_again" - style="?android:attr/borderlessButtonStyle" android:layout_width="wrap_content" android:layout_height="48dp" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_below="@+id/nfc_activity_3_placeholder" android:layout_margin="8dp" - android:text="@string/error_nfc_try_again" - android:textColor="@color/accent" /> + android:text="@string/error_nfc_try_again" /> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml index 047225394..b3228ea06 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="@color/transparent" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> </merge>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml index a626efb09..477967edd 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="@color/transparent" - app:theme="@style/ThemeOverlay.AppCompat.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> </merge>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 8e04f6899..32c63abb2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:overScrollMode="always" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" android:transitionGroup="false" |