X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ba8ee979d0bf5b821ab1241706cd1f15272dccd1..00482b6dcb1e98da39df54374f7098b51d66bee5:/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 901434e2..fab638d2 100644 --- 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, @@ -22,6 +25,8 @@ import java.util.ArrayList; 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; @@ -30,8 +35,6 @@ import android.widget.ListAdapter; 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.owncloud.android.utils.DisplayUtils; @@ -41,14 +44,15 @@ import com.owncloud.android.utils.DisplayUtils; * * 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 @@ -70,7 +74,8 @@ public class GenericExplanationActivity extends SherlockFragmentActivity { ListView listView = (ListView) findViewById(R.id.list); if (list != null && list.size() > 0) { - //ListAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, list); + //ListAdapter adapter = new ArrayAdapter(this, + // android.R.layout.simple_list_item_1, list); ListAdapter adapter = new ExplanationListAdapterView(this, list, list2); listView.setAdapter(adapter); } else { @@ -86,7 +91,8 @@ public class GenericExplanationActivity extends SherlockFragmentActivity { ArrayList mList; ArrayList mList2; - ExplanationListAdapterView(Context context, ArrayList list, ArrayList list2) { + ExplanationListAdapterView(Context context, ArrayList list, + ArrayList list2) { super(context, android.R.layout.two_line_list_item, android.R.id.text1, list); mList = list; mList2 = list2; @@ -104,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) { - 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));