diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
75 files changed, 108 insertions, 93 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png Binary files differdeleted file mode 100644 index e9d2dcb46..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_collapse.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png Binary files differdeleted file mode 100644 index 29f4de211..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_expand.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png Binary files differnew file mode 100644 index 000000000..37931a0ad --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png Binary files differnew file mode 100644 index 000000000..f42a0e2d2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png Binary files differnew file mode 100644 index 000000000..0fd15563a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png Binary files differnew file mode 100644 index 000000000..6f9b343ad --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_search_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png Binary files differnew file mode 100644 index 000000000..35e3b426f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png Binary files differnew file mode 100644 index 000000000..ed993f35d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png Binary files differnew file mode 100644 index 000000000..8ac075245 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..fc019db72 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..cd16fdd50 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png Binary files differnew file mode 100644 index 000000000..b16209fc1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png Binary files differnew file mode 100644 index 000000000..c900b8ec7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png Binary files differdeleted file mode 100644 index 4ac28f270..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_collapse.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png Binary files differdeleted file mode 100644 index bb46bb315..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_expand.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png Binary files differnew file mode 100644 index 000000000..5b1fd7766 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png Binary files differnew file mode 100644 index 000000000..e91f9048b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png Binary files differnew file mode 100644 index 000000000..e80681aeb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png Binary files differnew file mode 100644 index 000000000..7a69993fd --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_search_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png Binary files differnew file mode 100644 index 000000000..a5ab2c5d3 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png Binary files differnew file mode 100644 index 000000000..73fc3b422 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png Binary files differnew file mode 100644 index 000000000..9e6d0f0ac --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..1df91994c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..235c84f1e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png Binary files differnew file mode 100644 index 000000000..3405c951d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png Binary files differnew file mode 100644 index 000000000..5e8781731 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png Binary files differdeleted file mode 100644 index 60ac6b066..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_collapse.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png Binary files differdeleted file mode 100644 index 76937f57a..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_expand.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png Binary files differnew file mode 100644 index 000000000..c8187799b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png Binary files differnew file mode 100644 index 000000000..e5024472a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png Binary files differnew file mode 100644 index 000000000..76e07f097 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png Binary files differnew file mode 100644 index 000000000..1f0db264a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_cloud_search_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png Binary files differnew file mode 100644 index 000000000..47c7b52a1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png Binary files differnew file mode 100644 index 000000000..45d30d999 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png Binary files differnew file mode 100644 index 000000000..9cd050100 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..ae48a3bf7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..5f89fc257 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png Binary files differnew file mode 100644 index 000000000..2b775b646 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png Binary files differnew file mode 100644 index 000000000..ccbdce4ab --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png Binary files differdeleted file mode 100644 index 76ec594dc..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_collapse.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png Binary files differdeleted file mode 100644 index 22003198b..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_expand.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png Binary files differnew file mode 100644 index 000000000..626543b47 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png Binary files differnew file mode 100644 index 000000000..6e03d54cf --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png Binary files differnew file mode 100644 index 000000000..0eb9d8b08 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png Binary files differnew file mode 100644 index 000000000..852cdc2a6 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_cloud_search_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png Binary files differnew file mode 100644 index 000000000..0470e3f02 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png Binary files differnew file mode 100644 index 000000000..aadd04af6 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png Binary files differnew file mode 100644 index 000000000..529a7724b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..cf149aa37 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..72128fe69 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png Binary files differnew file mode 100644 index 000000000..47f0e0d82 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png Binary files differnew file mode 100644 index 000000000..736bde37a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png Binary files differnew file mode 100644 index 000000000..d12d2e796 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png Binary files differnew file mode 100644 index 000000000..87892840e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png Binary files differnew file mode 100644 index 000000000..7b2a480a0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png Binary files differnew file mode 100644 index 000000000..08ae54533 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png Binary files differnew file mode 100644 index 000000000..228b2a982 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png Binary files differnew file mode 100644 index 000000000..a0fe0156f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png Binary files differnew file mode 100644 index 000000000..7460e0894 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..d271d8e03 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png Binary files differnew file mode 100644 index 000000000..bce161d00 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png Binary files differnew file mode 100644 index 000000000..3451d9855 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml deleted file mode 100644 index b219038b2..000000000 --- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml +++ /dev/null @@ -1,26 +0,0 @@ -<!-- - Copyright 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:dividerPadding="12dp" - android:orientation="horizontal" - android:showDividers="end" > - - <include layout="@layout/actionbar_include_done_button" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml deleted file mode 100644 index e9047e759..000000000 --- a/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - Copyright 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:dividerPadding="12dp" - android:orientation="horizontal" - android:showDividers="middle"> - - <include layout="@layout/actionbar_include_cancel_button" /> - - <include layout="@layout/actionbar_include_done_button" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/custom_drawer.xml b/OpenKeychain/src/main/res/layout/custom_drawer.xml new file mode 100644 index 000000000..021226ba3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/custom_drawer.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:background="@color/colorPrimary"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/app_name" + android:textColor="@color/white" + android:layout_gravity="center_horizontal" /> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 13cf7c225..d6165c1e0 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:src="@drawable/ic_action_expand"/> + android:src="@drawable/ic_expand_more_black_24dp"/> <TextView android:id="@+id/foldableText" diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml new file mode 100644 index 000000000..5eb50da07 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog.xml @@ -0,0 +1,10 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:dividerPadding="12dp" + android:orientation="horizontal" + android:showDividers="middle"> + + <include layout="@layout/full_screen_dialog_done_button" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml new file mode 100644 index 000000000..b1d5efe76 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml @@ -0,0 +1,12 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:dividerPadding="12dp" + android:orientation="horizontal" + android:showDividers="middle"> + + <include layout="@layout/full_screen_dialog_2_cancel_button" /> + + <include layout="@layout/full_screen_dialog_2_done_button" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml index ec27e394a..7c2c2a62d 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml @@ -1,19 +1,3 @@ -<!-- - Copyright 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_cancel" style="@style/Widget.AppCompat.ActionButton" @@ -30,12 +14,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_action_cancel" + android:drawableLeft="@drawable/ic_close_white_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" android:filterTouchesWhenObscured="true" style="@style/Widget.AppCompat.Light.ActionBar.TabText" + android:textAllCaps="true" + android:textSize="14sp" android:text="Cancel (set in-code!)" /> </FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml index 2590f272c..cd24a1e6d 100644 --- a/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml @@ -1,19 +1,3 @@ -<!-- - Copyright 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/actionbar_done" style="@style/Widget.AppCompat.ActionButton" @@ -30,12 +14,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_action_done" + android:drawableLeft="@drawable/ic_check_white_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" android:filterTouchesWhenObscured="true" style="@style/Widget.AppCompat.Light.ActionBar.TabText" + android:textAllCaps="true" + android:textSize="14sp" android:text="Done (set in-code!)" /> </FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml new file mode 100644 index 000000000..49018fee1 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml @@ -0,0 +1,25 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/full_screen_dialog_done" + style="@style/Widget.AppCompat.ActionButton" + android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <!-- + android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking + https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/ + --> + <TextView + android:id="@+id/full_screen_dialog_done_text" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center_vertical" + android:paddingRight="16dp" + android:paddingEnd="16dp" + style="@style/Widget.AppCompat.Light.ActionBar.TabText" + android:textAllCaps="true" + android:textSize="14sp" + android:filterTouchesWhenObscured="true" + android:text="Done (set in-code!)" /> + +</FrameLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml new file mode 100644 index 000000000..ed375094f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml @@ -0,0 +1,10 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:dividerPadding="12dp" + android:orientation="horizontal" + android:showDividers="end" > + + <include layout="@layout/full_screen_dialog_2_done_button" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index f61172a0a..8a682badc 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -11,13 +11,12 @@ <item android:id="@+id/menu_key_list_search_cloud" - android:icon="@drawable/ic_action_search_cloud" + android:icon="@drawable/ic_cloud_search_24px" android:title="@string/menu_search_cloud" app:showAsAction="ifRoom|withText" /> <item android:id="@+id/menu_key_list_add" - android:icon="@drawable/ic_action_qr_code" android:title="@string/import_qr_code_button" app:showAsAction="ifRoom|withText" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index de2a77f62..1151644d8 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -20,7 +20,7 @@ <string name="title_preferences">"Settings"</string> <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string> <string name="title_api_registered_apps">"Apps"</string> - <string name="title_key_server_preference">"Keyserver Preference"</string> + <string name="title_key_server_preference">"Keyservers"</string> <string name="title_change_passphrase">"Change Passphrase"</string> <string name="title_share_fingerprint_with">"Share fingerprint with…"</string> <string name="title_share_key">"Share key with…"</string> @@ -41,6 +41,7 @@ <string name="title_create_key">"Create Key"</string> <string name="title_exchange_keys">"Exchange Keys"</string> <string name="title_advanced_key_info">"Advanced Key Info"</string> + <string name="title_keys">"Keys"</string> <!-- section --> <string name="section_user_ids">"Identities"</string> @@ -826,6 +827,7 @@ <!-- modifySecretKeyRing --> <string name="msg_mr">"Modifying keyring %s"</string> + <string name="msg_mf_error_divert_serial">"The serial number of a divert-to-card key must be 16 bytes! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_encode">"Encoding exception!"</string> <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string> <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string> @@ -833,6 +835,7 @@ <string name="msg_mf_error_master_none">"No master certificate found to operate on! (All revoked?)"</string> <string name="msg_mf_error_noexist_primary">"Bad primary user ID specified!"</string> <string name="msg_mf_error_noexist_revoke">"Bad user ID for revocation specified!"</string> + <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string> <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string> @@ -905,6 +908,13 @@ <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string> <string name="msg_ed_success">"Key operation successful"</string> + <!-- Promote key --> + <string name="msg_pr">"Promoting public key to secret key"</string> + <string name="msg_pr_error_already_secret">"Key is already a secret key!"</string> + <string name="msg_pr_error_key_not_found">"Key not found!"</string> + <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string> + <string name="msg_pr_success">"Key successfully promoted"</string> + <!-- Other messages used in OperationLogs --> <string name="msg_ek_error_divert">"Editing of NFC keys is not (yet) supported!"</string> <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string> @@ -914,6 +924,7 @@ <string name="msg_dc_askip_no_key">"Data not encrypted with known key, skipping…"</string> <string name="msg_dc_askip_not_allowed">"Data not encrypted with allowed key, skipping…"</string> <string name="msg_dc_asym">"Found block of asymmetrically encrypted data for key %s"</string> + <string name="msg_dc_charset">"Found charset header: '%s'"</string> <string name="msg_dc_clear_data">"Processing literal data"</string> <string name="msg_dc_clear_decompress">"Unpacking compressed data"</string> <string name="msg_dc_clear_meta_file">"Filename: %s"</string> @@ -1012,6 +1023,7 @@ <string name="msg_import_fingerprint_ok">"Fingerprint check OK"</string> <string name="msg_import_merge">"Merging retrieved data"</string> <string name="msg_import_error">"Import operation failed!"</string> + <string name="msg_import_error_io">"Import operation failed due to i/o error!"</string> <string name="msg_import_partial">"Import operation successful, with errors!"</string> <string name="msg_import_success">"Import operation successful!"</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 602c85247..3b7d66963 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -9,6 +9,19 @@ <item name="android:windowNoTitle">true</item> <item name="windowActionBar">false</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> + <item name="colorAccent">@color/accent</item> + + <!-- Navigation Drawer library --> + <item name="drawerType">@integer/DRAWERTYPE_CUSTOM</item> + <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="popupTheme">@style/Base.V21.Theme.AppCompat.Light.Dialog</item> + <item name="drawerColor">#fafafa</item> + <item name="singleAccount">false</item> + <item name="sectionStyle">@style/MaterialSectionTheme.Light</item> + <item name="subheaderStyle">@style/MaterialSubheaderTheme.Light</item> + <item name="multipaneSupport">false</item> + <item name="rippleBackport">false</item> + <item name="uniqueToolbarColor">false</item> </style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> @@ -18,7 +31,7 @@ <!-- Background for the actions section (e.g. voice, submit) --> <!--<item name="submitBackground">...</item>--> <!-- Close button icon --> - <!--<item name="closeIcon">...</item>--> + <item name="closeIcon">@drawable/ic_close_white_24dp</item> <!-- Search button icon --> <!--<item name="searchIcon">...</item>--> <!-- Go/commit button icon --> |
