styles: cleanup for API 21+
Change-Id: Ibc167cd19b4c7916060a13758ca945dfe281a9bf
diff --git a/ring-android/app/src/main/res/values-v21/dimens.xml b/ring-android/app/src/main/res/values-v21/dimens.xml
deleted file mode 100644
index f796a41..0000000
--- a/ring-android/app/src/main/res/values-v21/dimens.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2004-2016 Savoir-faire Linux Inc.
-
-Author: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Additional permission under GNU GPL version 3 section 7:
-
-If you modify this program, or any covered work, by linking or
-combining it with the OpenSSL project's OpenSSL library (or a
-modified version of that library), containing parts covered by the
-terms of the OpenSSL or SSLeay licenses, Savoir-faire Linux Inc.
-grants you additional permission to convey the resulting work.
-Corresponding Source for a non-source form of such a combination
-shall include the source code for the parts of OpenSSL used as well
-as that of the covered work.
--->
-<resources>
-
- <dimen name="action_button_lpadding">16dp</dimen>
- <dimen name="action_button_bpadding">-20dp</dimen>
- <dimen name="fab_compat_margin">16dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-v21/styles.xml b/ring-android/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 8034a47..0000000
--- a/ring-android/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
- <style name="AppTheme.ActionBar.Transparent" parent="@style/Theme.MaterialComponents">
- <item name="android:windowTranslucentStatus">true</item>
- <item name="android:windowTranslucentNavigation">true</item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowActionBarOverlay">true</item>
- <item name="windowActionBarOverlay">true</item>
- <item name="android:actionBarStyle">@style/ActionBar.Transparent</item>
- <item name="actionBarStyle">@style/ActionBar.Transparent</item>
- </style>
-
- <style name="AppThemeBase.Dark" parent="@style/Theme.MaterialComponents.NoActionBar">
- <item name="colorAccent">@color/color_primary_dark</item>
- <item name="colorPrimary">@color/color_primary_light</item>
- <item name="colorPrimaryDark">@color/color_primary_dark</item>
- <item name="android:windowContentTransitions">true</item>
- </style>
-
- <style name="AppThemeBase" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
- <item name="colorAccent">@color/color_primary_dark</item>
- <item name="colorPrimary">@color/color_primary_light</item>
- <item name="colorPrimaryDark">@color/color_primary_dark</item>
- <item name="android:windowContentTransitions">true</item>
- </style>
-
-
-</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml
index 7ed8ded..ccdda6c 100644
--- a/ring-android/app/src/main/res/values/dimens.xml
+++ b/ring-android/app/src/main/res/values/dimens.xml
@@ -29,9 +29,9 @@
<dimen name="activity_horizontal_margin">32dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
- <dimen name="action_button_lpadding">0dp</dimen>
- <dimen name="action_button_bpadding">-45dp</dimen>
- <dimen name="fab_compat_margin">0dp</dimen>
+ <dimen name="action_button_lpadding">16dp</dimen>
+ <dimen name="action_button_bpadding">-20dp</dimen>
+ <dimen name="fab_compat_margin">16dp</dimen>
<dimen name="alert_dialog_side_padding_list_view">16dp</dimen>
diff --git a/ring-android/app/src/main/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
index 7e29a61..da5d20e 100644
--- a/ring-android/app/src/main/res/values/styles.xml
+++ b/ring-android/app/src/main/res/values/styles.xml
@@ -1,17 +1,27 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="AppTheme.ActionBar.Transparent" parent="@style/Theme.MaterialComponents">
+ <item name="android:windowTranslucentStatus">true</item>
+ <item name="android:windowTranslucentNavigation">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowActionBarOverlay">true</item>
+ <item name="windowActionBarOverlay">true</item>
+ <item name="android:actionBarStyle">@style/ActionBar.Transparent</item>
+ <item name="actionBarStyle">@style/ActionBar.Transparent</item>
+ </style>
+
+ <style name="AppThemeBase.Dark" parent="@style/Theme.MaterialComponents.NoActionBar">
+ <item name="colorAccent">@color/color_primary_dark</item>
+ <item name="colorPrimary">@color/color_primary_light</item>
+ <item name="colorPrimaryDark">@color/color_primary_dark</item>
+ <item name="android:windowContentTransitions">true</item>
+ </style>
+
<style name="AppThemeBase" parent="@style/Theme.MaterialComponents.Light.NoActionBar">
<item name="colorAccent">@color/color_primary_dark</item>
<item name="colorPrimary">@color/color_primary_light</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
- <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
- </style>
-
- <style name="AppThemeBase.Dark" parent="@style/Theme.MaterialComponents.NoActionBar">
- <item name="colorAccent">@color/color_primary_light</item>
- <item name="colorPrimary">@color/color_primary_dark</item>
- <item name="colorPrimaryDark">@color/color_primary_light</item>
- <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
<style name="AppTheme" parent="@style/Theme.MaterialComponents.Light">
@@ -27,13 +37,6 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
- <style name="AppTheme.ActionBar.Transparent" parent="@style/Theme.MaterialComponents.Light">
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowActionBarOverlay">true</item>
- <item name="android:actionBarStyle">@style/ActionBar.Transparent</item>
- <item name="actionBarStyle">@style/ActionBar.Transparent</item>
- </style>
-
<style name="ActionBar.Transparent" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/transparent_dark_grey</item>
<item name="android:height">@dimen/abc_action_bar_default_height_material</item>