diff options
| author | kwadronaut <kwadronaut@leap.se> | 2016-09-19 12:38:29 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-09-19 12:38:29 +0200 |
| commit | f9c44da143a2d29baac6260c2e5caf9a96dacbc3 (patch) | |
| tree | c2435766b6a8d7ddd70f2a0dcfc501a7d93c45f4 /app/src/main/res/values/styles.xml | |
| parent | 00ebc6d66ff9e8a0fa01b808ce7dbd0335933baf (diff) | |
| parent | 56ba118a5713fe0e24120815cd28db141709a497 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'app/src/main/res/values/styles.xml')
| -rw-r--r-- | app/src/main/res/values/styles.xml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 94970c88..4cdf2c00 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> @@ -63,4 +53,10 @@ </style> + <style name="blinkt.translucent" parent="blinkt.dialog"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowActionBar">false</item> + <item name="android:windowFullscreen">true</item> + <item name="android:windowContentOverlay">@null</item> + </style> </resources>
\ No newline at end of file |