diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:22 +0200 |
| commit | 1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (patch) | |
| tree | add2f0d85813f9ece1be3c926b4ae8f221d7cf47 /OpenKeychain/src/main/res/values/themes.xml | |
| parent | d6d678dae3ed5d794a9aa5e289197d264f6a7ff9 (diff) | |
| parent | c442d3bd0d3bac96614d3d5c0e833a42cab4706e (diff) | |
| download | open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.gz open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.tar.bz2 open-keychain-1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc.zip | |
Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
OpenKeychain/src/main/res/menu/decrypt_menu.xml
Diffstat (limited to 'OpenKeychain/src/main/res/values/themes.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index c87895c01..96d09151d 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -8,26 +8,17 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> - <item name="android:windowNoTitle">true</item> + <item name="windowNoTitle">true</item> <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> - <!-- Navigation Drawer library --> - <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> <!-- dark action bar... --> <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> <!-- ...but light popup menu (white background) --> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> - <item name="drawerColor">#fafafa</item> - <item name="singleAccount">false</item> - <item name="sectionStyle">@style/MaterialSectionTheme.Light</item> - <item name="subheaderStyle">@style/MaterialSubheaderTheme.Light</item> - <item name="multipaneSupport">false</item> - <item name="rippleBackport">false</item> - <item name="uniqueToolbarColor">false</item> </style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> |