cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

designing encrypt and decrypt

Browse Source
This commit is contained in:
Dominik
2012-04-13 03:33:00 +02:00
parent 01230cd0a9
commit 4793cd1c25
4 changed files with 54 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org_apg/src/org/apg/ui/DecryptActivity.java
View File

@@ -250,12 +250,6 @@ public class DecryptActivity extends BaseActivity {
Log.d(Constants.TAG, "got extras");
}
// disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
mData = extras.getByteArray(Apg.EXTRA_DATA);
String textData = null;
if (mData == null) {
@@ -312,6 +306,12 @@ public class DecryptActivity extends BaseActivity {
extras = new Bundle();
}
// disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
mReturnBinary = extras.getBoolean(Apg.EXTRA_BINARY, false);
if (mContentUri == null) {

10
org_apg/src/org/apg/ui/EncryptActivity.java
View File

@@ -314,10 +314,12 @@ public class EncryptActivity extends BaseActivity {
}
// disable home button on actionbar because this activity is run from another app
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction())) {
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(false);
actionBar.setHomeButtonEnabled(false);
}
if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction())
|| Apg.Intent.GENERATE_SIGNATURE.equals(mIntent.getAction())) {