diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 13:54:33 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 13:54:33 +0200 |
| commit | 86a05033aedc965c1842db45094c744094a906af (patch) | |
| tree | 72b70a32060aea5be8bcebf60f9fc13e1960b000 /OpenKeychain/src/main/res | |
| parent | 5ddbbb76bee45d801b184748d6535a736dffde57 (diff) | |
| download | open-keychain-86a05033aedc965c1842db45094c744094a906af.tar.gz open-keychain-86a05033aedc965c1842db45094c744094a906af.tar.bz2 open-keychain-86a05033aedc965c1842db45094c744094a906af.zip | |
Cleanup FoldableLinearLayout
Diffstat (limited to 'OpenKeychain/src/main/res')
4 files changed, 5 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index aaeae78e0..d8e1d9ad8 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -59,9 +59,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" custom:foldedLabel="@string/api_settings_show_advanced" - custom:unFoldedLabel="@string/api_settings_hide_advanced" - custom:foldedIcon="fa-chevron-right" - custom:unFoldedIcon="fa-chevron-down"> + custom:unFoldedLabel="@string/api_settings_hide_advanced"> <TextView android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml index ceea1d8a6..6ef31913a 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml @@ -40,9 +40,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" custom:foldedLabel="@string/api_settings_show_info" - custom:unFoldedLabel="@string/api_settings_hide_info" - custom:foldedIcon="fa-chevron-right" - custom:unFoldedIcon="fa-chevron-down"> + custom:unFoldedLabel="@string/api_settings_hide_info"> <TextView android:layout_width="match_parent" @@ -67,7 +65,7 @@ android:id="@+id/api_app_settings_package_signature" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Base64 encoded signature" + android:text="Base64 encoded hash of signature" android:textAppearance="?android:attr/textAppearanceSmall" /> </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index 3d2fb688b..13cf7c225 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -11,14 +11,13 @@ android:orientation="horizontal" android:clickable="true"> - <ImageButton + <ImageView android:id="@+id/foldableIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginRight="10dp" - android:src="@drawable/ic_action_expand" - android:background="@drawable/button_no_style"/> + android:src="@drawable/ic_action_expand"/> <TextView android:id="@+id/foldableText" diff --git a/OpenKeychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml index 86622b3e0..5dfa03987 100644 --- a/OpenKeychain/src/main/res/values/attr.xml +++ b/OpenKeychain/src/main/res/values/attr.xml @@ -4,8 +4,6 @@ <declare-styleable name="FoldableLinearLayout"> <attr name="foldedLabel" format="string" /> <attr name="unFoldedLabel" format="string" /> - <attr name="foldedIcon" format="string" /> - <attr name="unFoldedIcon" format="string" /> </declare-styleable> </resources>
\ No newline at end of file |