aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 15:46:57 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 15:46:57 +0200
commit33cad382f96b673587e841932ea322a1dd6fa23b (patch)
tree571da2040f52346a734c936d7a7c37d2e3c28afd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
parent5a1120e79113c94bcc8620ba086d6203d62b1b1d (diff)
downloadopen-keychain-33cad382f96b673587e841932ea322a1dd6fa23b.tar.gz
open-keychain-33cad382f96b673587e841932ea322a1dd6fa23b.tar.bz2
open-keychain-33cad382f96b673587e841932ea322a1dd6fa23b.zip
Use flat buttons where appropriate
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
index 90783aa8b..dbd1b7507 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
@@ -32,8 +32,6 @@ import android.widget.ArrayAdapter;
import android.widget.Spinner;
import android.widget.Toast;
-import com.beardedhen.androidbootstrap.BootstrapButton;
-
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.helper.Preferences;
@@ -46,7 +44,7 @@ import org.sufficientlysecure.keychain.util.Log;
* Sends the selected public key to a keyserver
*/
public class UploadKeyActivity extends ActionBarActivity {
- private BootstrapButton mUploadButton;
+ private View mUploadButton;
private Spinner mKeyServerSpinner;
private Uri mDataUri;
@@ -55,10 +53,10 @@ public class UploadKeyActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.key_server_export);
+ setContentView(R.layout.upload_key_activity);
- mUploadButton = (BootstrapButton) findViewById(R.id.btn_export_to_server);
- mKeyServerSpinner = (Spinner) findViewById(R.id.sign_key_keyserver);
+ mUploadButton = findViewById(R.id.upload_key_action_upload);
+ mKeyServerSpinner = (Spinner) findViewById(R.id.upload_key_keyserver);
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
android.R.layout.simple_spinner_item, Preferences.getPreferences(this)