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

Merge remote-tracking branch 'origin/master' into v/multi-decrypt

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-26 02:44:59 +02:00
parent a990044fd9 51d35c7a83
commit dce4503ac5
23 changed files with 461 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 919 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 654 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

22
OpenKeychain/src/main/res/layout/key_list_selectable_item.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:singleLine="true"
android:orientation="horizontal"
android:descendantFocusability="blocksDescendants"
android:focusable="false">
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:layout_margin="6dp" />
<include layout="@layout/key_list_item" />
</LinearLayout>

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

@@ -1221,9 +1221,12 @@
<string name="msg_export_log_success">"Log exported successfully!"</string>
<!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string>
<string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string>
<string name="passp_cache_notif_keys">"Cached Passwords:"</string>
<string name="passp_cache_notif_click_to_clear">"Touch to clear password cache."</string>
<plurals name="passp_cache_notif_n_keys">
<item quantity="one">"%d password cached"</item>
<item quantity="other">"%d passwords cached"</item>
</plurals>
<string name="passp_cache_notif_keys">"Cached passwords"</string>
<string name="passp_cache_notif_clear">"Clear Cache"</string>
<string name="passp_cache_notif_pwd">"Password"</string>