moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues 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-04 23:31:04 +02:00
commit 4b372a5c33
3 changed files with 146 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/AddKeysActivity.java
View File

@ -384,9 +384,9 @@ public class AddKeysActivity extends ActionBarActivity implements
}
finish();
Intent certifyIntent = new Intent(); // TODO: certify
Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class);
certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
certifyIntent.putExtra("key ids", result.getImportedMasterKeyIds()); // TODO: extra
certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
startActivity(certifyIntent);
result.createNotify(AddKeysActivity.this).show();

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

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/notify_area" />
@ -160,5 +164,5 @@
android:layout_marginBottom="8dp" />
</LinearLayout>
</LinearLayout>
</ScrollView>

2
OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
View File

@ -135,7 +135,7 @@
android:layout_weight="1"
android:text="@string/btn_next"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_action_new_account"
android:drawableRight="@drawable/ic_action_play"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:clickable="true"