mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 08:28:50 -05:00
use new multi certify, layout fixes
This commit is contained in:
parent
0a264bad28
commit
4fcd58b9f8
@ -384,9 +384,9 @@ public class AddKeysActivity extends ActionBarActivity implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
finish();
|
finish();
|
||||||
Intent certifyIntent = new Intent(); // TODO: certify
|
Intent certifyIntent = new Intent(AddKeysActivity.this, MultiCertifyKeyActivity.class);
|
||||||
certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
|
certifyIntent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
|
||||||
certifyIntent.putExtra("key ids", result.getImportedMasterKeyIds()); // TODO: extra
|
certifyIntent.putExtra(MultiCertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
|
||||||
startActivity(certifyIntent);
|
startActivity(certifyIntent);
|
||||||
|
|
||||||
result.createNotify(AddKeysActivity.this).show();
|
result.createNotify(AddKeysActivity.this).show();
|
||||||
|
@ -1,9 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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:id="@+id/content_frame"
|
||||||
android:layout_marginLeft="@dimen/drawer_content_padding"
|
android:layout_marginLeft="@dimen/drawer_content_padding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<include layout="@layout/notify_area" />
|
<include layout="@layout/notify_area" />
|
||||||
@ -160,5 +164,5 @@
|
|||||||
android:layout_marginBottom="8dp" />
|
android:layout_marginBottom="8dp" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</ScrollView>
|
@ -135,7 +135,7 @@
|
|||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/btn_next"
|
android:text="@string/btn_next"
|
||||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:drawableRight="@drawable/ic_action_new_account"
|
android:drawableRight="@drawable/ic_action_play"
|
||||||
android:drawablePadding="8dp"
|
android:drawablePadding="8dp"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
|
Loading…
Reference in New Issue
Block a user