moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

Fix colors for remote activity

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-09 16:55:23 +01:00
parent bd1705410a
commit b2e5ac2820
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@ -288,7 +288,7 @@ public class OpenPgpService extends RemoteService {
}
} else if (pgpResult.success()) {
Intent result = new Intent();
if (!cleartextSign) {
if (pgpResult.getDetachedSignature() != null && !cleartextSign) {
result.putExtra(OpenPgpApi.RESULT_DETACHED_SIGNATURE, pgpResult.getDetachedSignature());
}
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);

24
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View File

@ -77,18 +77,6 @@
android:padding="16dp"
android:orientation="vertical">
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/api_settings_allowed_keys" />
<FrameLayout
android:id="@+id/api_allowed_keys_list_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
<TextView
android:id="@+id/api_accounts_label"
style="@style/SectionHeader"
@ -103,6 +91,18 @@
android:layout_height="match_parent"
android:orientation="vertical" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/api_settings_allowed_keys" />
<FrameLayout
android:id="@+id/api_allowed_keys_list_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
</LinearLayout>
</ScrollView>
</LinearLayout>

7
OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:background="?attr/colorPrimaryDark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -29,14 +28,12 @@
android:gravity="center_vertical"
android:orientation="vertical"
android:text="Name (set in-code)"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
<org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/icons"
custom:foldedLabel="@string/api_settings_show_info"
custom:unFoldedLabel="@string/api_settings_hide_info">
@ -44,7 +41,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/api_settings_package_name"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@ -52,14 +48,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="com.example"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/api_settings_package_signature"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
@ -67,7 +61,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Base64 encoded hash of signature"
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceSmall" />
</org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>