Maybe fixes encrypt files on tablets

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

View File

@ -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())) {

View File

@ -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() {

View File

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

View File

@ -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" />