diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-31 18:49:54 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-31 18:49:54 +0100 |
| commit | 0b6dc65c97b0fb5dae9bf1a06f9c7db0b65ea4ad (patch) | |
| tree | 92954cab7f0aa299c2658a9f15586168ccf12e4f /OpenKeychain/src/main/res/values | |
| parent | 5466d1e9802815726d713bca2aeabaff2861519c (diff) | |
| parent | e651a392795caa395b060946b0cfaca5a5b41ded (diff) | |
| download | open-keychain-0b6dc65c97b0fb5dae9bf1a06f9c7db0b65ea4ad.tar.gz open-keychain-0b6dc65c97b0fb5dae9bf1a06f9c7db0b65ea4ad.tar.bz2 open-keychain-0b6dc65c97b0fb5dae9bf1a06f9c7db0b65ea4ad.zip | |
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 12 |
4 files changed, 10 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 353e33058..fbbb89ed1 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -19,13 +19,12 @@ <color name="primary">#4CAF50</color> <color name="primary_dark">#388E3C</color> <color name="primary_light">#C8E6C9</color> - <color name="accent">#536DFE</color> + <color name="accent">#00BCD4</color> <color name="primary_text">#212121</color> <color name="secondary_text">#727272</color> <color name="icons">#FFFFFF</color> <color name="divider">#B6B6B6</color> - <!-- set to text colors --> <color name="emphasis">#212121</color> <color name="emphasis_dark">#727272</color> diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index e1a7749f0..55344e519 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -1,5 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="drawer_size">240dp</dimen> - <dimen name="drawer_content_padding">0dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 794de34f0..ea2e02e1c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -489,6 +489,7 @@ <string name="api_settings_package_name">"Package Name"</string> <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> <string name="api_settings_accounts">"Accounts"</string> + <string name="api_settings_allowed_keys">"Allowed Keys"</string> <string name="api_settings_settings">"Settings"</string> <string name="api_settings_key">"Account key:"</string> <string name="api_settings_accounts_empty">"No accounts attached to this app."</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 3b7d66963..075f538e6 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -3,18 +3,22 @@ <style name="KeychainTheme" parent="KeychainTheme.Base" /> - <style name="KeychainTheme.Base" parent="HoloKeychainTheme"> + <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">--> + <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="colorAccent">@color/accent</item> + <item name="android:windowNoTitle">true</item> <item name="windowActionBar">false</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> - <item name="colorAccent">@color/accent</item> <!-- Navigation Drawer library --> - <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item> + <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> + <!-- dark action bar... --> <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> - <item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</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> |