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/styles.xml | |
| parent | 64e71b3972c3d633f199058a94b5a2be0c7bb14e (diff) | |
| parent | 8e67e4d2167f2508d7f069af4d69f0f2931844a7 (diff) | |
Merge branch 'feature/update-ics-openvpn' into develop
Diffstat (limited to 'app/src/main/res/values/styles.xml')
| -rw-r--r-- | app/src/main/res/values/styles.xml | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 94970c88..13d5e0b1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,24 +1,14 @@ <?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.DeviceDefault.Light" /> - <style name="blinkt.common" parent="blinkt.baseTheme" > - <!-- Shared between Holo and Material --> - <item name="android:preferenceStyle">@style/BlinktPreferencePanel</item> + <style name="blinkt" parent="blinkt.baseTheme" /> - </style> - - <style name="blinkt" parent="blinkt.common"> - </style> - - <!-- No margins or background by default. Not different for x-large screens --> - <style name="BlinktPreferencePanel"> - <item name="android:background">@color/gelb</item> - </style> + <style name="blinkt.dialog" parent="android:Theme.DeviceDefault.Light.Dialog" /> <style name="item"> <item name="android:layout_width">match_parent</item> |