mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

Use own accent colors for alert dialogs.

Browse Source
This commit is contained in:
Danny Baumann 2016-02-04 11:55:41 +01:00
parent 88aa92013f
commit dde7ad84c0
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/AndroidManifest.xml
View File

@ -42,7 +42,7 @@
android:autoRemoveFromRecents="true"
android:excludeFromRecents="true"
android:taskAffinity=""
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
android:theme="@style/blinkt.dialog" />
<activity
android:name=".activities.LogWindow"
@ -141,7 +141,7 @@
android:name=".LaunchVPN"
android:excludeFromRecents="true"
android:label="@string/vpn_launch_title"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:theme="@style/blinkt.dialog"
tools:ignore="ExportedActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

19
main/src/main/res/values-v21/styles.xml
View File

@ -5,11 +5,22 @@
-->
<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" parent="blinkt.common">
<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>
<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>

6
main/src/main/res/values/styles.xml
View File

@ -6,14 +6,12 @@
<resources>
<style name="blinkt.baseTheme" parent="android:Theme.DeviceDefault.Light" />
<style name="blinkt.common" parent="blinkt.baseTheme" >
<style name="blinkt" parent="blinkt.baseTheme" >
<!-- Shared between Holo and Material -->
<item name="android:preferenceStyle">@style/BlinktPreferencePanel</item>
</style>
<style name="blinkt" parent="blinkt.common">
</style>
<style name="blinkt.dialog" parent="android:Theme.DeviceDefault.Light.Dialog" />
<!-- No margins or background by default. Not different for x-large screens -->
<style name="BlinktPreferencePanel">