Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay

This commit is contained in:
David A. Velasco 2013-07-09 13:25:43 +02:00
commit fffa77e211
2 changed files with 4 additions and 4 deletions

View file

@ -137,10 +137,10 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
@Override
protected void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate() start");
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
mHandler = new Handler();
/// bindings to transference services

View file

@ -118,7 +118,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
super.onSaveInstanceState(outState);
outState.putParcelable(EXTRA_FILE, mFile);
}
/**
* Call this, when the user presses the up button