cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2014-05-07 09:05:38 +02:00
parent dc382a2ddd 174858e9cf
commit a36f7f80e2
27 changed files with 180 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_default_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 260 B

OpenKeychain/src/main/res/drawable-hdpi/apptheme_fastscroll_thumb_pressed_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 467 B

OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_default_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 B

OpenKeychain/src/main/res/drawable-mdpi/apptheme_fastscroll_thumb_pressed_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_default_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 324 B

OpenKeychain/src/main/res/drawable-xhdpi/apptheme_fastscroll_thumb_pressed_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 613 B

OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_default_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 600 B

OpenKeychain/src/main/res/drawable-xxhdpi/apptheme_fastscroll_thumb_pressed_holo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 911 B

OpenKeychain/src/main/res/drawable/apptheme_fastscroll_thumb_holo.xml
+20
View File
@@ -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>
OpenKeychain/src/main/res/drawable/keychaintheme_searchview_holo_light.xml
+7
View File
@@ -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>
OpenKeychain/src/main/res/layout/help_activity.xml
+5
View File
@@ -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"
OpenKeychain/src/main/res/layout/key_list_item.xml
+6 -5
View File
@@ -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>
OpenKeychain/src/main/res/layout/view_key_activity.xml
+31
View File
@@ -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"
OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
-22
View File
@@ -16,28 +16,6 @@
android:id="@+id/container"
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"
OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+3 -2
View File
@@ -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>
OpenKeychain/src/main/res/res/values-v11/styles_keychaintheme.xml
-24
View File
@@ -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>
OpenKeychain/src/main/res/res/values-v11/themes_keychaintheme.xml
-28
View File
@@ -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>
OpenKeychain/src/main/res/res/values/colors_keychaintheme.xml
-4
View File
@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="keychaintheme_color">#aa66cc</color>
</resources>
OpenKeychain/src/main/res/res/values/styles_keychaintheme.xml
-53
View File
@@ -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>
OpenKeychain/src/main/res/res/values/themes_keychaintheme.xml
-32
View File
@@ -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>
OpenKeychain/src/main/res/values-v11/themes_keychaintheme.xml
+5 -1
View File
@@ -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>
</resources>
OpenKeychain/src/main/res/values/strings.xml
+1
View File
@@ -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>