aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-29 22:23:48 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-29 22:23:48 +0200
commit51ea71d68ac58795abdc6f265ba8ed27a87ef05e (patch)
tree0eba609935f3c494d480b48a3e58c6029a81658e /OpenKeychain/src/main
parent0b16a4edfd102972b48b96b4de1ce30e029a47b5 (diff)
downloadopen-keychain-51ea71d68ac58795abdc6f265ba8ed27a87ef05e.tar.gz
open-keychain-51ea71d68ac58795abdc6f265ba8ed27a87ef05e.tar.bz2
open-keychain-51ea71d68ac58795abdc6f265ba8ed27a87ef05e.zip
Maybe fixes encrypt files on tablets
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java2
-rw-r--r--OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml (renamed from OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml)3
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_activity.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_activity.xml)2
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_content.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_content.xml)0
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml (renamed from OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml)0
6 files changed, 4 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
index dc97bc8fb..09d6b3d21 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
@@ -309,7 +309,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.encrypt_file_activity);
+ setContentView(R.layout.encrypt_files_activity);
// if called with an intent action, do not init drawer navigation
if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index fc4c9ed75..6961f5ee7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -76,7 +76,7 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
*/
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.encrypt_file_fragment, container, false);
+ View view = inflater.inflate(R.layout.encrypt_files_fragment, container, false);
View vEncryptFile = view.findViewById(R.id.action_encrypt_file);
vEncryptFile.setOnClickListener(new View.OnClickListener() {
diff --git a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
index fb1aaa1e8..4b277c331 100644
--- a/OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml
+++ b/OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
@@ -13,6 +13,5 @@
</android.support.v4.widget.FixedDrawerLayout>
- <include layout="@layout/decrypt_content_old" />
-
+ <include layout="@layout/encrypt_files_content" />
</FrameLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
index 46daad28f..cdcf4fa43 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_activity.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
tools:context=".ui.EncryptFileActivity">
- <include layout="@layout/encrypt_file_content"/>
+ <include layout="@layout/encrypt_files_content"/>
<include layout="@layout/drawer_list" />
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
index b44a2bc4d..b44a2bc4d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_content.xml
diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index f4c479ee9..f4c479ee9 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml