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

Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-10-05 11:11:20 +02:00
parent 34345cf237 2768671206
commit 12e44e7eeb
16 changed files with 205 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 913 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

28
OpenKeychain/src/main/res/layout/add_keys_activity.xml
View File

@@ -135,34 +135,6 @@
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/add_keys_section_import" />
<TextView
android:id="@+id/add_keys_search_cloud"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
android:text="@string/add_keys_cloud"
android:drawableRight="@drawable/ic_action_search"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp" />
</LinearLayout>
</LinearLayout>
</ScrollView>

13
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -7,18 +7,23 @@
android:title="@string/menu_search"
android:icon="@drawable/ic_action_search"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="collapseActionView|ifRoom" />
app:showAsAction="collapseActionView|always" />
<item
android:id="@+id/menu_key_list_search_cloud"
app:showAsAction="always|withText"
android:icon="@drawable/ic_action_search_cloud"
android:title="@string/menu_add_keys" />
<item
android:id="@+id/menu_key_list_add"
app:showAsAction="ifRoom|withText"
app:showAsAction="always|withText"
android:icon="@drawable/ic_action_new_account"
android:title="@string/menu_add_keys" />
<item
android:id="@+id/menu_key_list_export"
app:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_action_import_export"
app:showAsAction="never"
android:title="@string/menu_export_all_keys" />
<item

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

@@ -277,13 +277,10 @@
<!-- Add keys -->
<string name="add_keys_section_secure_exchange">"Secure Exchange"</string>
<string name="add_keys_section_secure_add">"Secure Add"</string>
<string name="add_keys_section_import">"Import (untrusted)"</string>
<string name="add_keys_my_key">"My key:"</string>
<string name="add_keys_start_exchange">"Start exchange"</string>
<string name="add_keys_qr_code">"Scan QR Code"</string>
<string name="add_keys_nfc">"Receive via NFC"</string>
<string name="add_keys_cloud">"Search cloud"</string>
<!-- progress dialogs, usually ending in '…' -->
<string name="progress_done">"Done."</string>