X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/007edfe102ea0d433005e4f2f47e42445831d3f0..8db0692daf94db68e08d765dcc3e57f0de638d28:/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java index 328128d3..e13ce678 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -22,13 +22,12 @@ import android.accounts.Account; import android.accounts.AccountManager; import android.app.AlertDialog; import android.app.Dialog; -import android.app.ActionBar.OnNavigationListener; import android.content.DialogInterface; -import android.content.Intent; import android.content.DialogInterface.OnCancelListener; -import android.content.res.Configuration; +import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentTransaction; +import android.support.v4.app.ActionBar; +import android.support.v4.app.ActionBar.OnNavigationListener; import android.support.v4.view.Menu; import android.support.v4.view.MenuItem; import android.view.MenuInflater; @@ -36,7 +35,6 @@ import android.widget.ArrayAdapter; import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.R.id; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; -import eu.alefzero.owncloud.ui.fragment.FileDetail; import eu.alefzero.owncloud.ui.fragment.FileList; /** @@ -65,16 +63,10 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity mDirectories = new ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item); mDirectories.add("/"); setContentView(R.layout.files); - getActionBar().setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST); - getActionBar().setDisplayShowTitleEnabled(false); - getActionBar().setListNavigationCallbacks(mDirectories, this); - - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - ft.add(R.id.file_list_container, new FileList()); - if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { - ft.add(R.id.fileDetail, new FileDetail()); - } - ft.commit(); + ActionBar action_bar = getSupportActionBar(); + action_bar.setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST); + action_bar.setDisplayShowTitleEnabled(false); + action_bar.setListNavigationCallbacks(mDirectories, this); } @Override