diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 02:35:09 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-25 02:35:09 +0100 |
| commit | 56d38dd68b7248dff54d56affce0af14e8e2e161 (patch) | |
| tree | 5b2f5b8b3350a83423fc6af06c7a6c858d29a28a /OpenKeychain/src/main/res/values | |
| parent | 2b609b8144c093b1034c2845a8110ac84eecc414 (diff) | |
| download | open-keychain-56d38dd68b7248dff54d56affce0af14e8e2e161.tar.gz open-keychain-56d38dd68b7248dff54d56affce0af14e8e2e161.tar.bz2 open-keychain-56d38dd68b7248dff54d56affce0af14e8e2e161.zip | |
First work on new key view toolbar
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/attr.xml | 9 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml index 5dfa03987..98ce1c364 100644 --- a/OpenKeychain/src/main/res/values/attr.xml +++ b/OpenKeychain/src/main/res/values/attr.xml @@ -6,4 +6,13 @@ <attr name="unFoldedLabel" format="string" /> </declare-styleable> + <declare-styleable name="AspectRatioImageView"> + <attr name="aspectRatio" format="float" /> + <attr name="aspectRatioEnabled" format="boolean" /> + <attr name="dominantMeasurement"> + <enum name="width" value="0" /> + <enum name="height" value="1" /> + </attr> + </declare-styleable> + </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 7e361a358..08b072202 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -3,4 +3,5 @@ <!-- on Android < 5, we do not color the status bar, thus 0dp! --> <dimen name="statusbar_height">0dp</dimen> <dimen name="big_toolbar">120dp</dimen> + <dimen name="huge_toolbar">212dp</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 4a56274d7..730746787 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -582,8 +582,11 @@ <string name="create_key_edit">"Change key configuration"</string> <!-- View key --> - <string name="view_key_revoked">"This key has been revoked!"</string> - <string name="view_key_expired">"This key is expired!"</string> + <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> + <string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string> + <string name="view_key_my_key">"My Key"</string> + <string name="view_key_verified">"Verified Key"</string> + <string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string> <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> |