diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-07 17:34:41 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-07 17:34:41 +0200 |
| commit | 2c62aa90c0560c975d34b39df4379b5e1fcd6884 (patch) | |
| tree | ba62bdeeb5130c6a886abffd940e8c59ffb37835 /OpenKeychain/src/main/res | |
| parent | d044daeedd9ae42e72ce3d3b2ed191778b173943 (diff) | |
| download | open-keychain-2c62aa90c0560c975d34b39df4379b5e1fcd6884.tar.gz open-keychain-2c62aa90c0560c975d34b39df4379b5e1fcd6884.tar.bz2 open-keychain-2c62aa90c0560c975d34b39df4379b5e1fcd6884.zip | |
use SuperToast instead of AppMsg in code, part 1
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/certify_key_activity.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_activity.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml index bb43fa805..1443ffd46 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index c4c2c35cb..156351887 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -4,6 +4,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" > + <LinearLayout + android:id="@+id/card_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> + <include layout="@layout/key_list_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 29780f235..36002b763 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -656,6 +656,7 @@ <string name="msg_mf_unlock">Unlocking keyring</string> <!-- unsorted --> + <string name="internal_error">Internal error!</string> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> <string name="label_user_id">Identity</string> |