From 9f7f4fd27a02c02b15df613710433dfc35ad8e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 15 Feb 2014 18:04:30 +0100 Subject: Add None-entry to ListPreference --- .../res/drawable-hdpi/ic_action_cancel_launchersize.png | Bin 0 -> 1520 bytes .../res/drawable-mdpi/ic_action_cancel_launchersize.png | Bin 0 -> 1032 bytes .../res/drawable-xhdpi/ic_action_cancel_launchersize.png | Bin 0 -> 1570 bytes .../drawable-xxhdpi/ic_action_cancel_launchersize.png | Bin 0 -> 2345 bytes .../keychain-api-library/res/values/strings.xml | 6 ++++++ .../openintents/openpgp/util/OpenPgpListPreference.java | 6 ++++++ 6 files changed, 12 insertions(+) create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml (limited to 'OpenPGP-Keychain-API') diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png new file mode 100644 index 000000000..71b9118dc Binary files /dev/null and b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png differ diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png new file mode 100644 index 000000000..270abf45f Binary files /dev/null and b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png differ diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png new file mode 100644 index 000000000..1e3571fa5 Binary files /dev/null and b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png differ diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png new file mode 100644 index 000000000..52044601e Binary files /dev/null and b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png differ diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml new file mode 100644 index 000000000..a198d0b5e --- /dev/null +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + None + + \ No newline at end of file diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java index e29794e87..4917b6993 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java @@ -33,6 +33,8 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.List; +import org.sufficientlysecure.keychain.api.R; + public class OpenPgpListPreference extends DialogPreference { ArrayList mProviderList = new ArrayList(); private String mSelectedPackage; @@ -55,6 +57,10 @@ public class OpenPgpListPreference extends DialogPreference { mProviderList.add(new OpenPgpProviderEntry(packageName, simpleName, icon)); } } + + // add "none" + mProviderList.add(0, new OpenPgpProviderEntry("", context.getString(R.string.openpgp_list_preference_none), + context.getResources().getDrawable(R.drawable.ic_action_cancel_launchersize))); } public OpenPgpListPreference(Context context) { -- cgit v1.2.3