moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-12 05:58:07 -05:00
Code Issues Releases Wiki Activity

Maybe fixes encrypt files on tablets

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-29 22:23:48 +02:00
parent 0b16a4edfd
commit 51ea71d68a
6 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java
View File

@ -309,7 +309,7 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(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 called with an intent action, do not init drawer navigation
if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) { if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
View File

@ -76,7 +76,7 @@ public class EncryptFilesFragment extends Fragment implements EncryptActivityInt
*/ */
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { 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); View vEncryptFile = view.findViewById(R.id.action_encrypt_file);
vEncryptFile.setOnClickListener(new View.OnClickListener() { vEncryptFile.setOnClickListener(new View.OnClickListener() {

3
OpenKeychain/src/main/res/layout-large/decrypt_activity_old.xml → OpenKeychain/src/main/res/layout-large/encrypt_files_activity.xml
View File

@ -13,6 +13,5 @@
</android.support.v4.widget.FixedDrawerLayout> </android.support.v4.widget.FixedDrawerLayout>
<include layout="@layout/decrypt_content_old" /> <include layout="@layout/encrypt_files_content" />
</FrameLayout> </FrameLayout>

2
OpenKeychain/src/main/res/layout/encrypt_file_activity.xml → OpenKeychain/src/main/res/layout/encrypt_files_activity.xml
View File

@ -7,7 +7,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.EncryptFileActivity"> tools:context=".ui.EncryptFileActivity">
<include layout="@layout/encrypt_file_content"/> <include layout="@layout/encrypt_files_content"/>
<include layout="@layout/drawer_list" /> <include layout="@layout/drawer_list" />

0
OpenKeychain/src/main/res/layout/encrypt_file_content.xml → OpenKeychain/src/main/res/layout/encrypt_files_content.xml
View File

0
OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml → OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
View File