use material labels for passphrase text

closes #3374
Closes #4570
// FREEBIE
This commit is contained in:
Jake McGinty
2015-11-16 17:39:13 -08:00
committed by Moxie Marlinspike
parent 245c0adeea
commit 25da3525fa
7 changed files with 47 additions and 52 deletions

View File

@@ -25,7 +25,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -49,7 +48,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
private EditText originalPassphrase;
private EditText newPassphrase;
private EditText repeatPassphrase;
private TextView originalPassphraseLabel;
private Button okButton;
private Button cancelButton;
@@ -72,7 +70,6 @@ public class PassphraseChangeActivity extends PassphraseActivity {
}
private void initializeResources() {
this.originalPassphraseLabel = (TextView) findViewById(R.id.old_passphrase_label);
this.originalPassphrase = (EditText) findViewById(R.id.old_passphrase );
this.newPassphrase = (EditText) findViewById(R.id.new_passphrase );
this.repeatPassphrase = (EditText) findViewById(R.id.repeat_passphrase );
@@ -85,10 +82,8 @@ public class PassphraseChangeActivity extends PassphraseActivity {
if (TextSecurePreferences.isPasswordDisabled(this)) {
this.originalPassphrase.setVisibility(View.GONE);
this.originalPassphraseLabel.setVisibility(View.GONE);
} else {
this.originalPassphrase.setVisibility(View.VISIBLE);
this.originalPassphraseLabel.setVisibility(View.VISIBLE);
}
}