Merge pull request #955 from owncloud/thumbnailOOM

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / GenericExplanationActivity.java

diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index 4c433a9..0d4ab01 100644 (file)
--- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@ -1,5 +1,8 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2013 ownCloud Inc.
+/**
+ *   ownCloud Android client application
+ *
+ *   @author David A. Velasco
+ *   Copyright (C) 2015 ownCloud Inc.

  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,


@@ -30,16 +33,17 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import android.widget.ListView;
 import android.widget.TextView;
 

+import com.actionbarsherlock.app.ActionBar;

 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;

+import com.owncloud.android.utils.DisplayUtils;
+

 
 /**
  * Activity showing a text message and, optionally, a couple list of single or paired text strings.
  * 
  * Added to show explanations for notifications when the user clicks on them, and there no place
  * better to show them.
 
 /**
  * Activity showing a text message and, optionally, a couple list of single or paired text strings.
  * 
  * Added to show explanations for notifications when the user clicks on them, and there no place
  * better to show them.

- * 
- * @author David A. Velasco

  */
 public class GenericExplanationActivity  extends SherlockFragmentActivity {
 
  */
 public class GenericExplanationActivity  extends SherlockFragmentActivity {
 


@@ -73,6 +77,9 @@ public class GenericExplanationActivity  extends SherlockFragmentActivity {
         } else {
             listView.setVisibility(View.GONE);
         }
         } else {
             listView.setVisibility(View.GONE);
         }

+        
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setIcon(DisplayUtils.getSeasonalIconId());

     }
     
     public class ExplanationListAdapterView extends ArrayAdapter<String> {
     }
     
     public class ExplanationListAdapterView extends ArrayAdapter<String> {