moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Fix Toolbars in decrypt activities

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-14 10:35:40 +01:00
parent 47051f9a09
commit d9e0f0a271
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesActivity.java
View File

@ -27,7 +27,7 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.api.OpenKeychainIntents; import org.sufficientlysecure.keychain.api.OpenKeychainIntents;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
public class DecryptFilesActivity extends ActionBarActivity { public class DecryptFilesActivity extends BaseActivity {
/* Intents */ /* Intents */
public static final String ACTION_DECRYPT_DATA = OpenKeychainIntents.DECRYPT_DATA; public static final String ACTION_DECRYPT_DATA = OpenKeychainIntents.DECRYPT_DATA;
@ -41,12 +41,15 @@ public class DecryptFilesActivity extends ActionBarActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.decrypt_files_activity);
// Handle intent actions // Handle intent actions
handleActions(savedInstanceState, getIntent()); handleActions(savedInstanceState, getIntent());
} }
@Override
protected void initLayout() {
setContentView(R.layout.decrypt_files_activity);
}
/** /**
* Handles all actions with this intent * Handles all actions with this intent
* *

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java
View File

@ -35,7 +35,7 @@ import org.sufficientlysecure.keychain.ui.util.Notify;
import java.util.regex.Matcher; import java.util.regex.Matcher;
public class DecryptTextActivity extends ActionBarActivity { public class DecryptTextActivity extends BaseActivity {
/* Intents */ /* Intents */
public static final String ACTION_DECRYPT_TEXT = OpenKeychainIntents.DECRYPT_TEXT; public static final String ACTION_DECRYPT_TEXT = OpenKeychainIntents.DECRYPT_TEXT;
@ -50,12 +50,15 @@ public class DecryptTextActivity extends ActionBarActivity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.decrypt_text_activity);
// Handle intent actions // Handle intent actions
handleActions(savedInstanceState, getIntent()); handleActions(savedInstanceState, getIntent());
} }
@Override
protected void initLayout() {
setContentView(R.layout.decrypt_text_activity);
}
/** /**
* Fixing broken PGP MESSAGE Strings coming from GMail/AOSP Mail * Fixing broken PGP MESSAGE Strings coming from GMail/AOSP Mail
*/ */

26
OpenKeychain/src/main/res/layout/decrypt_files_activity.xml
View File

@ -1,14 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<include layout="@layout/notify_area" /> <include
android:id="@+id/toolbar"
layout="@layout/toolbar" />
<FrameLayout <LinearLayout
android:id="@+id/decrypt_files_fragment_container" android:layout_below="@id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout> <include layout="@layout/notify_area" />
<FrameLayout
android:id="@+id/decrypt_files_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</RelativeLayout>