diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml | 73 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
3 files changed, 8 insertions, 74 deletions
diff --git a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml index 2f63d143d..af9a8add6 100644 --- a/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/redirect_import_keys_activity.xml @@ -1,73 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:tools="http://schemas.android.com/tools"> - - <include - android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone" /> - - <!-- - fitsSystemWindows and layout_marginTop from - https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 - --> - <LinearLayout - android:layout_below="@id/toolbar_include" - android:fitsSystemWindows="true" - android:layout_marginTop="@dimen/minus_statusbar_height" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include layout="@layout/notify_area" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:id="@+id/import_keys_top_layout" - android:visibility="gone" - tools:visibility="visible"> - - <FrameLayout - android:id="@+id/import_keys_top_container" - android:layout_width="match_parent" - android:layout_height="64dp" - android:orientation="vertical" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - </LinearLayout> - - <FrameLayout - android:id="@+id/import_keys_list_container" - android:layout_width="match_parent" - android:layout_height="0dp" - android:orientation="vertical" - android:layout_weight="1" /> - - <RelativeLayout - android:id="@+id/import_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:id="@+id/import_divider" - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" /> - - <RelativeLayout - android:id="@+id/import_snackbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignBottom="@id/import_import" /> - - </RelativeLayout> - </LinearLayout> + android:layout_height="match_parent"> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 254dc02bb..2630c407f 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -5,7 +5,5 @@ <dimen name="big_toolbar">120dp</dimen> <dimen name="huge_toolbar">222dp</dimen> <dimen name="minus_statusbar_height">0dp</dimen> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index acc0c7f20..95e089275 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1740,6 +1740,9 @@ <item>50 EUR</item> <item>100 EUR</item> </string-array> - <string name="title_activity_redirect_key">RedirectKeyActivity</string> - <string name="action_settings">Settings</string> + <string name="redirect_import_key_title">"Import key attempt"</string> + <string name="redirect_import_key_message">"You scanned a fingerprint with another app, please scan with Openkeychain directly to be safe"</string> + <string name="redirect_import_key_yes">Scan again</string> + <string name="redirect_import_key_no">Close</string> + <string name="title_activity_redirect_key">Key import redirection</string> </resources> |