wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

incorporate feedback

Browse source
This commit is contained in:
Vincent Breitmoser 2017-01-21 23:41:25 +01:00
parent 485029c5c2
commit 407d6d7ec9
2 changed files with 77 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
k9mail/src/main/res/layout/dialog_apg_deprecated.xml
View file

@ -1,87 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:padding="14dp">
android:layout_width="match_parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/apg_deprecated_1"
style="?android:textAppearanceMedium"
android:id="@+id/textView"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@+id/textView"
android:layout_marginTop="8dp"
android:id="@+id/layout_bullet_1">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
<RelativeLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="14dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_1"
style="?android:textAppearanceMedium" />
android:text="@string/apg_deprecated_1"
style="?android:textAppearanceMedium"
android:id="@+id/textView"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:id="@+id/layout_bullet_2"
android:layout_below="@+id/layout_bullet_1"
android:layout_alignLeft="@+id/layout_bullet_1"
android:layout_alignStart="@+id/layout_bullet_1"
>
<ImageView
android:layout_width="wrap_content"
<LinearLayout
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
android:layout_width="wrap_content"
android:layout_below="@+id/textView"
android:layout_marginTop="8dp"
android:id="@+id/layout_bullet_1">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_1"
style="?android:textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:id="@+id/layout_bullet_2"
android:layout_below="@+id/layout_bullet_1"
android:layout_alignLeft="@+id/layout_bullet_1"
android:layout_alignStart="@+id/layout_bullet_1"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_2"
style="?android:textAppearanceMedium" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_2"
android:text="@string/apg_deprecated_2"
android:id="@+id/apg_support_removed"
android:layout_below="@+id/layout_bullet_2"
android:layout_marginTop="8dp"
style="?android:textAppearanceMedium" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/apg_learn_more"
android:text="@string/apg_learn_more"
android:layout_below="@+id/apg_support_removed"
android:layout_marginTop="8dp"
style="?android:textAppearanceMedium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/apg_deprecated_2"
android:id="@+id/apg_support_removed"
android:layout_below="@+id/layout_bullet_2"
android:layout_marginTop="8dp"
style="?android:textAppearanceMedium" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/apg_learn_more"
android:text="@string/apg_learn_more"
android:layout_below="@+id/apg_support_removed"
android:layout_marginTop="8dp"
style="?android:textAppearanceMedium" />
</RelativeLayout>
</ScrollView>

2
plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java
View file

@ -335,6 +335,6 @@ public class OpenPgpAppPreference extends DialogPreference {
Intent intent = new Intent("org.openintents.openpgp.IOpenPgpService");
intent.setPackage(PACKAGE_NAME_APG);
List<ResolveInfo> resInfo = context.getPackageManager().queryIntentServices(intent, 0);
return !resInfo.isEmpty();
return resInfo != null && !resInfo.isEmpty();
}
}