diff options
author | Lubo Viluda <lubo.viluda@gmail.com> | 2016-03-20 11:52:36 +0100 |
---|---|---|
committer | Lubo Viluda <lubo.viluda@gmail.com> | 2016-03-20 11:52:36 +0100 |
commit | 7efeebc6381784a9362e5514fb50084c662dd335 (patch) | |
tree | a910e8f82d484ffa10b24081cc4c62af80503584 /OpenKeychain/src/main/res/values | |
parent | 556c04db829c7e7534d03e8eb101a13d2cab6503 (diff) | |
download | open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.tar.gz open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.tar.bz2 open-keychain-7efeebc6381784a9362e5514fb50084c662dd335.zip |
#1661 - Don't expose CertifyActivity
*Add new activity - RedirectImportKeysActivity, which prompts user to
use Openkeychain directly
*Add intent filter for the activity
*Change intent filter for CertifyActivity
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 3 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 2aae06e2e..254dc02bb 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -5,4 +5,7 @@ <dimen name="big_toolbar">120dp</dimen> <dimen name="huge_toolbar">222dp</dimen> <dimen name="minus_statusbar_height">0dp</dimen> + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</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 70db4029b..acc0c7f20 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1740,4 +1740,6 @@ <item>50 EUR</item> <item>100 EUR</item> </string-array> + <string name="title_activity_redirect_key">RedirectKeyActivity</string> + <string name="action_settings">Settings</string> </resources> |