diff options
| author | Ishan Khanna <ishan1604@gmail.com> | 2015-03-04 02:20:08 +0530 |
|---|---|---|
| committer | Ishan Khanna <ishan1604@gmail.com> | 2015-03-04 02:20:08 +0530 |
| commit | f3fd3c464c927ce099ede3bcc4dea16c68fc34fa (patch) | |
| tree | 9adf6ffa0a5e9cd5652e2bc2417132c26e7010d7 /OpenKeychain/src/main/java/org | |
| parent | f5b877ca2208e0b9f14886c7f6011ffb55e6898e (diff) | |
| parent | 5a4fc0a07127155f9c560374e65bf1373979d3ac (diff) | |
| download | open-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.tar.gz open-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.tar.bz2 open-keychain-f3fd3c464c927ce099ede3bcc4dea16c68fc34fa.zip | |
Merge remote-tracking branch 'upstream/development' into development
Diffstat (limited to 'OpenKeychain/src/main/java/org')
2 files changed, 1 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java index 01218a4e4..970855c77 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java @@ -24,7 +24,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.CheckBox; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -73,10 +72,8 @@ public class UserIdsAddedAdapter extends ArrayAdapter<String> { holder.vDelete.setVisibility(View.VISIBLE); // always visible // not used: - CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.user_id_item_check_box); View certifiedLayout = convertView.findViewById(R.id.user_id_item_certified_layout); ImageView editImage = (ImageView) convertView.findViewById(R.id.user_id_item_edit_image); - checkBox.setVisibility(View.GONE); certifiedLayout.setVisibility(View.GONE); editImage.setVisibility(View.GONE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java index f46e253c0..fc618c9eb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/EditSubkeyExpiryDialogFragment.java @@ -151,9 +151,7 @@ public class EditSubkeyExpiryDialogFragment extends DialogFragment { ); } - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) { - datePicker.setMinDate(creationCal.getTime().getTime()); - } + datePicker.setMinDate(creationCal.getTime().getTime()); alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override |