Merge pull request #1088 from owncloud/updated_docs_about_target_of_PRs

[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 b971c40..fab638d 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,


@@ -22,6 +25,8 @@ import java.util.ArrayList;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;

+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;

 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.view.ViewGroup;
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.view.ViewGroup;


@@ -30,8 +35,8 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import android.widget.ListView;
 import android.widget.TextView;
 

-import com.actionbarsherlock.app.SherlockFragmentActivity;

 import com.owncloud.android.R;
 import com.owncloud.android.R;

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

 
 
 /**
 
 
 /**


@@ -39,14 +44,15 @@ import com.owncloud.android.R;
  * 
  * Added to show explanations for notifications when the user clicks on them, and there no place
  * better to show them.
  * 
  * 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 ActionBarActivity {

 
 

-    public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() + ".EXTRA_LIST";
-    public static final String EXTRA_LIST_2 = GenericExplanationActivity.class.getCanonicalName() + ".EXTRA_LIST_2";
-    public static final String MESSAGE = GenericExplanationActivity.class.getCanonicalName() + ".MESSAGE";
+    public static final String EXTRA_LIST = GenericExplanationActivity.class.getCanonicalName() +
+            ".EXTRA_LIST";
+    public static final String EXTRA_LIST_2 = GenericExplanationActivity.class.getCanonicalName() +
+            ".EXTRA_LIST_2";
+    public static final String MESSAGE = GenericExplanationActivity.class.getCanonicalName() +
+            ".MESSAGE";

     
     
     @Override
     
     
     @Override


@@ -68,12 +74,16 @@ public class GenericExplanationActivity  extends SherlockFragmentActivity {
         
         ListView listView = (ListView) findViewById(R.id.list);
         if (list != null && list.size() > 0) {
         
         ListView listView = (ListView) findViewById(R.id.list);
         if (list != null && list.size() > 0) {

-            //ListAdapter adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, list);
+            //ListAdapter adapter = new ArrayAdapter<String>(this,
+            // android.R.layout.simple_list_item_1, list);

             ListAdapter adapter = new ExplanationListAdapterView(this, list, list2);
             listView.setAdapter(adapter);
         } else {
             listView.setVisibility(View.GONE);
         }
             ListAdapter adapter = new ExplanationListAdapterView(this, list, list2);
             listView.setAdapter(adapter);
         } else {
             listView.setVisibility(View.GONE);
         }

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

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


@@ -81,7 +91,8 @@ public class GenericExplanationActivity  extends SherlockFragmentActivity {
         ArrayList<String> mList;
         ArrayList<String> mList2;
         
         ArrayList<String> mList;
         ArrayList<String> mList2;
         

-        ExplanationListAdapterView(Context context, ArrayList<String> list, ArrayList<String> list2) {
+        ExplanationListAdapterView(Context context, ArrayList<String> list,
+                                   ArrayList<String> list2) {

             super(context, android.R.layout.two_line_list_item, android.R.id.text1, list);
             mList = list;
             mList2 = list2;
             super(context, android.R.layout.two_line_list_item, android.R.id.text1, list);
             mList = list;
             mList2 = list2;


@@ -99,7 +110,8 @@ public class GenericExplanationActivity  extends SherlockFragmentActivity {
         public View getView (int position, View convertView, ViewGroup parent) {
             View view = super.getView(position, convertView, parent);
             if (view != null)  {
         public View getView (int position, View convertView, ViewGroup parent) {
             View view = super.getView(position, convertView, parent);
             if (view != null)  {

-                if (mList2 != null && mList2.size() > 0 && position >= 0 && position < mList2.size()) {
+                if (mList2 != null && mList2.size() > 0 && position >= 0 &&
+                        position < mList2.size()) {

                     TextView text2 = (TextView) view.findViewById(android.R.id.text2);
                     if (text2 != null) {
                         text2.setText(mList2.get(position));
                     TextView text2 = (TextView) view.findViewById(android.R.id.text2);
                     if (text2 != null) {
                         text2.setText(mList2.get(position));