First work on new key view toolbar

This commit is contained in:
Dominik Schürmann
2015-02-25 02:35:09 +01:00
parent 2b609b8144
commit 56d38dd68b
33 changed files with 599 additions and 930 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>