cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toolbar fixes, Toolbar under status bar on Lollipop

Browse Source
This commit is contained in:
Dominik Schürmann
2015-02-03 16:05:18 +01:00
parent e2a8819385
commit 7914aa5c08
34 changed files with 118 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/res/values/colors.xml
View File

@@ -12,12 +12,12 @@
<color name="black_translucent">#80000000</color>
<!-- Palette generated by Material Palette materialpalette.com/green/indigo -->
<color name="colorPrimary">#4CAF50</color>
<color name="colorPrimaryDark">#388E3C</color>
<color name="colorPrimary">#8bc34a</color>
<color name="colorPrimaryDark">#558b2f</color>
<!-- TODO: -->
<color name="primary">#4CAF50</color>
<color name="primary_dark">#388E3C</color>
<color name="primary">#8bc34a</color>
<color name="primary_dark">#558b2f</color>
<color name="primary_light">#C8E6C9</color>
<color name="accent">#00BCD4</color>
<color name="fab">#00BCD4</color>

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -488,7 +488,8 @@
<string name="api_settings_delete_account">"Delete account"</string>
<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_accounts">"Accounts (deprecated API)"</string>
<string name="api_settings_advanced">"Advanced Information"</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>

3
OpenKeychain/src/main/res/values/themes.xml
View File

@@ -6,10 +6,11 @@
<!--<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="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/accent</item>
<item name="android:windowNoTitle">true</item>
<!-- remove actionbar, we use toolbar! -->
<item name="windowActionBar">false</item>
<item name="searchViewStyle">@style/MySearchViewStyle</item>