X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/82f4123260d6b1c2abd72f52979c97cd620af7cc..d474239b21f01465975ff43944ea4c2981802ff0:/src/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index cfeb5415..f7d28bd9 100644 --- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java +++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java @@ -196,9 +196,15 @@ public class FileDisplayActivity extends HookActivity // according to the official // documentation + // enable ActionBar app icon to behave as action to toggle nav drawer + //getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setHomeButtonEnabled(true); + setSupportProgressBarIndeterminateVisibility(mSyncInProgress /*|| mRefreshSharesInProgress*/); // always AFTER setContentView(...) ; to work around bug in its implementation + + initDrawer(); setBackgroundText(); @@ -209,7 +215,6 @@ public class FileDisplayActivity extends HookActivity protected void onStart() { Log_OC.v(TAG, "onStart() start"); super.onStart(); - getSupportActionBar().setIcon(DisplayUtils.getSeasonalIconId()); Log_OC.v(TAG, "onStart() end"); } @@ -1028,7 +1033,9 @@ public class FileDisplayActivity extends HookActivity startImagePreview(getFile()); } // TODO what about other kind of previews? } - + + setSupportProgressBarIndeterminate(false); + } finally { if (intent != null) { removeStickyBroadcast(intent); @@ -1166,7 +1173,6 @@ public class FileDisplayActivity extends HookActivity } - @Override protected ServiceConnection newTransferenceServiceConnection() { return new ListServiceConnection();