diff options
| -rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/gui/BasePreferencesActivity.java | 5 | ||||
| -rw-r--r-- | vdrmanager/src/de/bjusystems/vdrmanager/gui/ChannelListActivity.java | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/BasePreferencesActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/BasePreferencesActivity.java index bf525f4..ced04c7 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/BasePreferencesActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/BasePreferencesActivity.java @@ -4,12 +4,11 @@ import android.preference.DialogPreference; import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; +import android.preference.PreferenceActivity; import android.text.TextUtils; import android.view.inputmethod.EditorInfo; import android.widget.EditText; import de.bjusystems.vdrmanager.R; -import de.bjusystems.vdrmanager.data.OrmLiteBasePreferenceActivity; -import de.bjusystems.vdrmanager.data.db.OrmDatabaseHelper; /** * @@ -17,7 +16,7 @@ import de.bjusystems.vdrmanager.data.db.OrmDatabaseHelper; * @author lado * */ -public abstract class BasePreferencesActivity extends OrmLiteBasePreferenceActivity<OrmDatabaseHelper> { +public abstract class BasePreferencesActivity extends PreferenceActivity { protected void updateSummary(Preference ep) { if (ep instanceof EditTextPreference) { diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/ChannelListActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/ChannelListActivity.java index 6a6e5b2..b4c71d6 100644 --- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/ChannelListActivity.java +++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/ChannelListActivity.java @@ -244,14 +244,14 @@ public class ChannelListActivity extends return true; } - private static final String[] EMPTY = new String[] {}; + private String[] getAvailableGroupByEntries() { ArrayList<String> entries = new ArrayList<String>(2); entries.add(getString(R.string.groupby_group)); entries.add(getString(R.string.groupby_provider)); entries.add(getString(R.string.groupby_name)); - return entries.toArray(EMPTY); + return entries.toArray(Utils.EMPTY); } AlertDialog groupByDialog = null; |