diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
22 files changed, 78 insertions, 171 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png Binary files differnew file mode 100644 index 000000000..0ddafab03 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png Binary files differnew file mode 100644 index 000000000..c062b17f8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png Binary files differnew file mode 100644 index 000000000..ebffb16a0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png Binary files differnew file mode 100644 index 000000000..b6739b564 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png Binary files differnew file mode 100644 index 000000000..7c5e21eeb --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png Binary files differnew file mode 100644 index 000000000..86814b45d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png Binary files differnew file mode 100644 index 000000000..5e4818bfc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png Binary files differnew file mode 100644 index 000000000..7dd89e1f4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png diff --git a/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml b/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml new file mode 100644 index 000000000..e7121f083 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/apptheme_fastscroll_thumb_pressed_holo" /> + <item android:drawable="@drawable/apptheme_fastscroll_thumb_default_holo" /> +</selector> diff --git a/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml b/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml new file mode 100644 index 000000000..e82b1c2f3 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_focused="true" + android:drawable="@drawable/keychaintheme_textfield_activated_holo_light" /> + <item android:drawable="@drawable/keychaintheme_textfield_default_holo_light" /> +</selector>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 58e4919dc..76ba183b7 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,6 +4,11 @@ android:layout_height="match_parent" android:orientation="vertical" > + <org.sufficientlysecure.keychain.util.SlidingTabLayout + android:id="@+id/sliding_tab_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <android.support.v4.view.ViewPager android:id="@+id/pager" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 85d9afdd3..73a20bd2e 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -48,7 +48,7 @@ <FrameLayout android:id="@+id/status_layout" - android:layout_width="80dp" + android:layout_width="wrap_content" android:layout_height="match_parent"> <ImageButton @@ -61,19 +61,20 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/black" android:src="@drawable/ic_action_edit" - android:text="@string/edit" /> + android:text="@string/edit" + android:padding="12dp" /> <TextView android:id="@+id/revoked" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="8dp" android:singleLine="true" android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceSmall" android:text="@string/revoked" android:textColor="#e00" - android:layout_gravity="center" /> + android:layout_gravity="center" + android:padding="12dp" /> <ImageView android:layout_width="wrap_content" @@ -81,7 +82,7 @@ android:id="@+id/verified" android:layout_gravity="center" android:src="@drawable/key_certify_ok_depth0" - android:paddingLeft="25dp" /> + android:padding="16dp" /> </FrameLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index eed71945b..f43aade25 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,6 +4,37 @@ android:layout_height="match_parent" android:orientation="vertical"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key is expired!" + android:id="@+id/view_key_expired" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:visibility="gone" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="This key has been revoked!" + android:id="@+id/view_key_revoked" + android:textColor="@color/alert" + android:textAppearance="?android:attr/textAppearanceSmall" + android:gravity="center_vertical|center_horizontal" + android:visibility="gone" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:visibility="gone" + android:id="@+id/status_divider" /> + <org.sufficientlysecure.keychain.util.SlidingTabLayout android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 7d0f714a0..1cd0f0214 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -17,28 +17,6 @@ android:visibility="visible"> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key is expired!" - android:id="@+id/view_key_expired" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="This key has been revoked!" - android:id="@+id/view_key_revoked" - android:minHeight="?android:attr/listPreferredItemHeight" - android:textColor="@color/alert" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_vertical|center_horizontal" - android:visibility="gone" /> - - <TextView style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="0dp" diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml index a6d147cc1..2f4041f8c 100644 --- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml @@ -15,7 +15,7 @@ android:focusable="false" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="22dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" @@ -25,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/certified" - android:src="@drawable/key_certify_ok_self" /> + android:src="@drawable/key_certify_ok_self" + android:layout_gravity="center_horizontal" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/res/values-v11/styles_keychaintheme.xml b/OpenKeychain/src/main/res/res/values-v11/styles_keychaintheme.xml deleted file mode 100644 index 91599cbfe..000000000 --- a/OpenKeychain/src/main/res/res/values-v11/styles_keychaintheme.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Generated with http://android-holo-colors.com --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="ButtonKeychainTheme" parent="android:Widget.Holo.Light.Button"> - <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> - </style> - - <style name="ImageButtonKeychainTheme" parent="android:Widget.Holo.Light.ImageButton"> - <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> - </style> - - <style name="SpinnerKeychainTheme" parent="android:Widget.Holo.Light.Spinner"> - <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item> - <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item> - </style> - - <style name="ProgressBarKeychainTheme" parent="android:Widget.Holo.Light.ProgressBar.Horizontal"> - <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item> - <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item> - </style> - -</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/res/values-v11/themes_keychaintheme.xml b/OpenKeychain/src/main/res/res/values-v11/themes_keychaintheme.xml deleted file mode 100644 index ab2d99bde..000000000 --- a/OpenKeychain/src/main/res/res/values-v11/themes_keychaintheme.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Generated with http://android-holo-colors.com --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="KeychainTheme" parent="@style/_KeychainTheme"/> - - <style name="_KeychainTheme" parent="Theme.AppCompat.Light"> - - <item name="android:editTextBackground">@drawable/keychaintheme_edit_text_holo_light</item> - - <item name="android:listChoiceIndicatorMultiple">@drawable/keychaintheme_btn_check_holo_light</item> - - <item name="android:buttonStyle">@style/ButtonKeychainTheme</item> - - <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item> - - <item name="android:dropDownSpinnerStyle">@style/SpinnerKeychainTheme</item> - - <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item> - - <item name="android:listChoiceBackgroundIndicator">@drawable/keychaintheme_list_selector_holo_light</item> - - <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item> - - </style> - -</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/res/values/colors_keychaintheme.xml deleted file mode 100644 index fdb9f3283..000000000 --- a/OpenKeychain/src/main/res/res/values/colors_keychaintheme.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="keychaintheme_color">#aa66cc</color> -</resources> diff --git a/OpenKeychain/src/main/res/res/values/styles_keychaintheme.xml b/OpenKeychain/src/main/res/res/values/styles_keychaintheme.xml deleted file mode 100644 index 0496967cc..000000000 --- a/OpenKeychain/src/main/res/res/values/styles_keychaintheme.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Generated with http://android-holo-colors.com --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="EditTextKeychainTheme" parent="android:Widget.EditText"> - <item name="android:background">@drawable/keychaintheme_edit_text_holo_light</item> - <item name="android:textColor">#000000</item> - </style> - - <style name="CheckBoxKeychainTheme" parent="android:Widget.CompoundButton.CheckBox"> - <item name="android:button">@drawable/keychaintheme_btn_check_holo_light</item> - </style> - - <style name="ButtonKeychainTheme" parent="android:Widget.Button"> - <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> - <item name="android:minHeight">48dip</item> - <item name="android:minWidth">64dip</item> - <item name="android:textColor">#000000</item> - </style> - - <style name="ImageButtonKeychainTheme" parent="android:Widget.ImageButton"> - <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> - </style> - - <style name="SpinnerKeychainTheme" parent="android:Widget.Spinner"> - <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item> - <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item> - </style> - - <style name="SpinnerDropDownItemKeychainTheme" parent="android:Widget.DropDownItem.Spinner"> - <item name="android:checkMark">@drawable/keychaintheme_btn_radio_holo_light</item> - </style> - <style name="ProgressBarKeychainTheme" parent="android:Widget.ProgressBar.Horizontal"> - <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item> - <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item> - <item name="android:minHeight">16dip</item> - <item name="android:maxHeight">16dip</item> - </style> - - <style name="ListViewKeychainTheme" parent="android:Widget.ListView"> - <item name="android:listSelector">@drawable/keychaintheme_list_selector_holo_light</item> - </style> - - <style name="ListViewKeychainTheme.White" parent="android:Widget.ListView.White"> - <item name="android:listSelector">@drawable/keychaintheme_list_selector_holo_light</item> - </style> - - <style name="SpinnerItemKeychainTheme" parent="android:TextAppearance.Widget.TextView.SpinnerItem"> - <item name="android:textColor">#000000</item> - </style> - -</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/res/values/themes_keychaintheme.xml b/OpenKeychain/src/main/res/res/values/themes_keychaintheme.xml deleted file mode 100644 index 5b240ddc7..000000000 --- a/OpenKeychain/src/main/res/res/values/themes_keychaintheme.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- Generated with http://android-holo-colors.com --> -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="KeychainTheme" parent="@style/_KeychainTheme"/> - - <style name="_KeychainTheme" parent="Theme.AppCompat.Light"> - - <item name="android:editTextStyle">@style/EditTextKeychainTheme</item> - - <item name="android:checkboxStyle">@style/CheckBoxKeychainTheme</item> - - <item name="android:buttonStyle">@style/ButtonKeychainTheme</item> - - <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item> - - <item name="android:spinnerStyle">@style/SpinnerKeychainTheme</item> - - <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItemKeychainTheme</item> - - <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item> - - <item name="android:listViewStyle">@style/ListViewKeychainTheme</item> - - <item name="android:listViewWhiteStyle">@style/ListViewKeychainTheme.White</item> - - <item name="android:spinnerItemStyle">@style/SpinnerItemKeychainTheme</item> - - </style> - -</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml index ab2d99bde..4f13f81c6 100644 --- a/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml +++ b/OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml @@ -23,6 +23,10 @@ <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item> + <item name="android:fastScrollThumbDrawable">@drawable/apptheme_fastscroll_thumb_holo</item> + + <item name="android:selectableItemBackground">@drawable/keychaintheme_list_selector_holo_light</item> + </style> -</resources>
\ No newline at end of file +</resources> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c59f4a05b..6ed9008e4 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -513,5 +513,6 @@ <string name="title_view_cert">View Certificate Details</string> <string name="unknown_algorithm">unknown</string> <string name="can_sign_not">cannot sign</string> + <string name="error_no_encrypt_subkey">No encryption subkey available!</string> </resources> |
