Merge remote-tracking branch 'origin/master'

1 files changed, 20 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LoaderFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LoaderFragment.java
index 87ab1bb8c..8634070cc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LoaderFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LoaderFragment.java
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.sufficientlysecure.keychain.ui;
 
 import android.os.Bundle;
@@ -9,14 +26,14 @@ import android.view.animation.AnimationUtils;
 
 import org.sufficientlysecure.keychain.R;
 
-/** This is a fragment helper class, which implements a generic
+/**
+ * This is a fragment helper class, which implements a generic
  * progressbar/container view.
- *
+ * <p/>
  * To use it in a fragment, simply subclass, use onCreateView to create the
  * layout's root view, and ues getContainer() as root view of your subclass.
  * The layout shows a progress bar by default, and can be switched to the
  * actual contents by calling setContentShown().
- * 
  */
 public class LoaderFragment extends Fragment {
     private boolean mContentShown;
@@ -35,7 +52,6 @@ public class LoaderFragment extends Fragment {
         mContentShown = false;
 
         return root;
-
     }
 
     protected ViewGroup getContainer() {