diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 18:04:30 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 18:04:30 +0100 |
| commit | 9f7f4fd27a02c02b15df613710433dfc35ad8e17 (patch) | |
| tree | 8f2c48b0c1b6df48aa5607ff0944cd5720e399aa /libraries | |
| parent | b97a099598145d1461696b423ed2a49577090391 (diff) | |
| download | open-keychain-9f7f4fd27a02c02b15df613710433dfc35ad8e17.tar.gz open-keychain-9f7f4fd27a02c02b15df613710433dfc35ad8e17.tar.bz2 open-keychain-9f7f4fd27a02c02b15df613710433dfc35ad8e17.zip | |
Add None-entry to ListPreference
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png | bin | 0 -> 1520 bytes | |||
| -rw-r--r-- | libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png | bin | 0 -> 1032 bytes | |||
| -rw-r--r-- | libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png | bin | 0 -> 1570 bytes | |||
| -rw-r--r-- | libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png | bin | 0 -> 2345 bytes | |||
| -rw-r--r-- | libraries/keychain-api-library/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java | 6 |
6 files changed, 12 insertions, 0 deletions
diff --git a/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png Binary files differnew file mode 100644 index 000000000..71b9118dc --- /dev/null +++ b/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png diff --git a/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png Binary files differnew file mode 100644 index 000000000..270abf45f --- /dev/null +++ b/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png diff --git a/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png Binary files differnew file mode 100644 index 000000000..1e3571fa5 --- /dev/null +++ b/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png diff --git a/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png Binary files differnew file mode 100644 index 000000000..52044601e --- /dev/null +++ b/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png diff --git a/libraries/keychain-api-library/res/values/strings.xml b/libraries/keychain-api-library/res/values/strings.xml new file mode 100644 index 000000000..a198d0b5e --- /dev/null +++ b/libraries/keychain-api-library/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="openpgp_list_preference_none">None</string> + +</resources>
\ No newline at end of file diff --git a/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java index e29794e87..4917b6993 100644 --- a/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java +++ b/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<OpenPgpProviderEntry> mProviderList = new ArrayList<OpenPgpProviderEntry>(); 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) { |
