diff options
| author | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
| commit | 433754368ff4d7339f09024960b5ed92d3452b7e (patch) | |
| tree | 79aa4772f46785d0c1a61285777c530a46499ee4 /app/src/main/res/values-v21/styles.xml | |
| parent | 64e71b3972c3d633f199058a94b5a2be0c7bb14e (diff) | |
| parent | 8e67e4d2167f2508d7f069af4d69f0f2931844a7 (diff) | |
Merge branch 'feature/update-ics-openvpn' into develop
Diffstat (limited to 'app/src/main/res/values-v21/styles.xml')
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 4379dd6d..83a693f1 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,15 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <resources> - <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar" /> + <!-- http://www.google.de/design/spec/style/color.html#color-color-palette --> + <style name="blinkt.baseTheme" parent="android:Theme.Material.Light.DarkActionBar"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item> + </style> + <style name="blinkt.dialog" parent="android:Theme.Material.Light.Dialog"> + <item name="android:colorPrimary">@color/primary</item> + <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorAccent">@color/accent</item> + <item name="android:alertDialogTheme">@style/blinkt.alertDialog</item> + </style> - <!-- http://www.google.de/design/spec/style/color.html#color-color-palette --> - <style name="blinkt" parent="blinkt.common"> + <style name="blinkt.alertDialog" parent="android:Theme.Material.Light.Dialog.Alert"> <item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorAccent">@color/accent</item> |