Skip to content
This repository has been archived by the owner on Feb 27, 2021. It is now read-only.

Commit

Permalink
incorporate feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@Valodim @cketti
Valodim authored and cketti committed Feb 7, 2017
1 parent 21711a2 commit abdceb6
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 67 deletions.
138 changes: 72 additions & 66 deletions k9mail/src/main/res/layout/dialog_apg_deprecated.xml
View file
Original file line number Diff line number Diff line change
@@ -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" />
<RelativeLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="14dp">

<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
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
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" />

<TextView
<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"
/>

<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_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_1"
style="?android:textAppearanceMedium" />
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"
>

</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>

<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"
>
<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" />

<ImageView
</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="6dp"
style="@style/NegativeBulletPoint"
/>
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" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/apg_deprecated_bullet_2"
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" />

</LinearLayout>

<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" />

<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>

</RelativeLayout>
</ScrollView>
2 changes: 1 addition & 1 deletion ...-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpAppPreference.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,6 @@ public static boolean isApgInstalled(Context context) {
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();
}
}

0 comments on commit abdceb6

Please sign in to comment.