diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
15 files changed, 13 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png Binary files differnew file mode 100644 index 000000000..9d4ed6e84 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png Binary files differnew file mode 100644 index 000000000..e76393659 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png Binary files differnew file mode 100644 index 000000000..3c2f8c09c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png Binary files differnew file mode 100644 index 000000000..046424643 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png Binary files differnew file mode 100644 index 000000000..8d36d7202 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png Binary files differnew file mode 100644 index 000000000..01a74bcc0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png Binary files differnew file mode 100644 index 000000000..ff07bd0a4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png Binary files differnew file mode 100644 index 000000000..b8002162a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png Binary files differnew file mode 100644 index 000000000..d786dc72f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png Binary files differnew file mode 100644 index 000000000..4bb97f992 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png Binary files differnew file mode 100644 index 000000000..fe0c8e41b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png Binary files differnew file mode 100644 index 000000000..51ab367a9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 794964adb..7d3e1834c 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -9,15 +10,17 @@ <LinearLayout android:layout_below="@id/toolbar" - android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout + <com.astuetz.PagerSlidingTabStrip android:id="@+id/sliding_tab_layout" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:textColor="#FFFFFF" + app:pstsIndicatorColor="#FFFFFF" /> <android.support.v4.view.ViewPager android:id="@+id/pager" diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 10612f5a8..a2d104694 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -46,10 +47,13 @@ android:visibility="gone" android:id="@+id/view_key_status_divider" /> - <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout + <com.astuetz.PagerSlidingTabStrip android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:textColor="#FFFFFF" + app:pstsIndicatorColor="#FFFFFF" /> <android.support.v4.view.ViewPager android:id="@+id/view_key_pager" diff --git a/OpenKeychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html index d54780491..75fe9de26 100644 --- a/OpenKeychain/src/main/res/raw/help_start.html +++ b/OpenKeychain/src/main/res/raw/help_start.html @@ -8,7 +8,7 @@ And don't add newlines before or after p tags because of transifex --> <h2>Getting started</h2> <p>First you need a personal key. Create one via the menu in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection. To share via QR Codes install <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>. Clicking on the links will open Google Play Store or F-Droid for installation.</p> +<p>On Android lower 4.4, it is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection.</p> <h2>I found a bug in OpenKeychain!</h2> <p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p> |
