From 99f8b7c579929018a94bc516014ff3adf9a6b14e Mon Sep 17 00:00:00 2001 From: Joel Pedraza Date: Fri, 30 Nov 2012 20:23:06 -0500 Subject: [PATCH] remove ABS dependency, fixes #5 --- demo/AndroidManifest.xml | 3 +- demo/res/values-v11/styles.xml | 11 -- demo/res/values-v14/styles.xml | 12 -- demo/res/values/styles.xml | 20 -- .../demo/DemoUnifiedPreferenceActivity.java | 4 +- library/pom.xml | 7 - library/res/values/atrs.xml | 6 +- .../UnifiedPreferenceHelper.java | 2 +- .../UnifiedSherlockPreferenceActivity.java | 187 ------------------ 9 files changed, 7 insertions(+), 245 deletions(-) delete mode 100644 demo/res/values-v11/styles.xml delete mode 100644 demo/res/values-v14/styles.xml delete mode 100644 demo/res/values/styles.xml delete mode 100644 library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml index 33e9a7e..1764cda 100644 --- a/demo/AndroidManifest.xml +++ b/demo/AndroidManifest.xml @@ -27,8 +27,7 @@ + android:label="@string/app_name" > diff --git a/demo/res/values-v11/styles.xml b/demo/res/values-v11/styles.xml deleted file mode 100644 index 00ee812..0000000 --- a/demo/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/demo/res/values-v14/styles.xml b/demo/res/values-v14/styles.xml deleted file mode 100644 index a550853..0000000 --- a/demo/res/values-v14/styles.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/demo/res/values/styles.xml b/demo/res/values/styles.xml deleted file mode 100644 index 954f5a9..0000000 --- a/demo/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java b/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java index 4e90ab5..38b3a65 100644 --- a/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java +++ b/demo/src/net/saik0/android/unifiedpreference/demo/DemoUnifiedPreferenceActivity.java @@ -21,9 +21,9 @@ import net.saik0.android.unifiedpreference.demo.R; import net.saik0.android.unifiedpreference.UnifiedPreferenceFragment; -import net.saik0.android.unifiedpreference.UnifiedSherlockPreferenceActivity; +import net.saik0.android.unifiedpreference.UnifiedPreferenceActivity; -public class DemoUnifiedPreferenceActivity extends UnifiedSherlockPreferenceActivity { +public class DemoUnifiedPreferenceActivity extends UnifiedPreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { // Set header resource MUST BE CALLED BEFORE super.onCreate diff --git a/library/pom.xml b/library/pom.xml index ec23d8a..55d78de 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -20,13 +20,6 @@ android provided - - - com.actionbarsherlock - actionbarsherlock - 4.2.0 - apklib - diff --git a/library/res/values/atrs.xml b/library/res/values/atrs.xml index 3c25fb5..9e31eab 100644 --- a/library/res/values/atrs.xml +++ b/library/res/values/atrs.xml @@ -4,9 +4,9 @@ from which the selects the set of preference to dig in to. --> - + - + @@ -14,7 +14,7 @@ - + diff --git a/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java b/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java index 3cd4606..f57dbee 100644 --- a/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java +++ b/library/src/net/saik0/android/unifiedpreference/UnifiedPreferenceHelper.java @@ -169,7 +169,7 @@ public void setSharedPreferencesMode(int sharedPreferencesMode) { * shown. */ @SuppressWarnings("deprecation") - protected void onPostCreate(Bundle savedInstanceState) { + public void onPostCreate(Bundle savedInstanceState) { if (isSinglePane()) { // In the simplified UI, fragments are not used at all and we // instead use the older PreferenceActivity APIs. diff --git a/library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java b/library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java deleted file mode 100644 index ae1914e..0000000 --- a/library/src/net/saik0/android/unifiedpreference/UnifiedSherlockPreferenceActivity.java +++ /dev/null @@ -1,187 +0,0 @@ -/* -** Copyright 2012, Joel Pedraza -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package net.saik0.android.unifiedpreference; - -import android.os.Bundle; - -import com.actionbarsherlock.app.SherlockPreferenceActivity; - -import java.util.List; - -/** - * A {@link PreferenceActivity} that presents a set of application settings. On - * handset devices, settings are presented as a single list. On tablets, - * settings are split by category, with category headers shown to the left of - * the list of settings. - *

- * See - * Android Design: Settings for design guidelines and the Settings - * API Guide for more information on developing a Settings UI. - */ -public abstract class UnifiedSherlockPreferenceActivity extends SherlockPreferenceActivity - implements UnifiedPreferenceContainer { - private UnifiedPreferenceHelper mHelper = new UnifiedPreferenceHelper(this); - - /** - * Determines whether the simplified settings UI should be shown. This is - * true if device doesn't have newer APIs like {@link PreferenceFragment}, - * or if forced via {@link onIsHidingHeaders}, or the device doesn't have an - * extra-large screen. In these cases, a single-pane "simplified" settings - * UI should be shown. - */ - public boolean isSinglePane() { - return mHelper.isSinglePane(); - } - - /** - * Returns the header resource to be used when building headers. - * - * @return The id of the header resource - */ - @Override - public int getHeaderRes() { - return mHelper.getHeaderRes(); - } - - /** - * Sets the header resource to be used when building headers. - * This must be called before super.onCreate unless overriding both - * {@link #onBuildHeaders(List)} and {@link #onBuildLegacyHeaders(List)} - * - * @param headerRes The id of the header resource - */ - @Override - public void setHeaderRes(int headerRes) { - mHelper.setHeaderRes(headerRes); - } - - /** - * Returns the current name of the SharedPreferences file that preferences - * managed by this will use. - * - * @return The name that can be passed to {@link Context#getSharedPreferences(String, int)} - * @see UnifiedPreferenceHelper#getSharedPreferencesName() - */ - @Override - public String getSharedPreferencesName() { - return mHelper.getSharedPreferencesName(); - } - - /** - * Sets the name of the SharedPreferences file that preferences managed by - * this will use. - * - * @param sharedPreferencesName The name of the SharedPreferences file. - * @see UnifiedPreferenceHelper#setSharedPreferencesName() - */ - @Override - public void setSharedPreferencesName(String sharedPreferencesName) { - mHelper.setSharedPreferencesName(sharedPreferencesName); - } - - /** - * Returns the current mode of the SharedPreferences file that preferences - * managed by this will use. - * - * @return The mode that can be passed to {@link Context#getSharedPreferences(String, int)} - * @see UnifiedPreferenceHelper#getSharedPreferencesMode() - */ - @Override - public int getSharedPreferencesMode() { - return mHelper.getSharedPreferencesMode(); - } - - /** - * Sets the mode of the SharedPreferences file that preferences managed by - * this will use. - * - * @param sharedPreferencesMode The mode of the SharedPreferences file. - * @see UnifiedPreferenceHelper#setSharedPreferencesMode() - */ - @Override - public void setSharedPreferencesMode(int sharedPreferencesMode) { - mHelper.setSharedPreferencesMode(sharedPreferencesMode); - } - - /** {@inheritDoc} */ - @Override - protected void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - mHelper.onPostCreate(savedInstanceState); - } - - /** - * Called when the activity needs its list of headers built. By implementing - * this and adding at least one item to the list, you will cause the - * activity to run in its modern fragment mode. Note that this function may - * not always be called; for example, if the activity has been asked to - * display a particular fragment without the header list, there is no need - * to build the headers. - * - *

- * Typical implementations will use {@link #loadHeadersFromResource} to fill - * in the list from a resource. For convenience this is done if a header - * resource has been set with {@link #setHeaderRes(int)}. - * - * @param target The list in which to place the headers. - */ - public void onBuildHeaders(List

target) { - mHelper.onBuildHeaders(target); - } - - /** - * Called when the activity needs its list of legacy headers built. - * - *

- * Typical implementations will use {@link #loadLegacyHeadersFromResource} - * to fill in the list from a resource. For convenience this is done if a - * header resource has been set with {@link #setHeaderRes(int)}. - * - * @param target The list in which to place the legacy headers. - */ - public void onBuildLegacyHeaders(List target) { - mHelper.onBuildLegacyHeaders(target); - } - - /** - * Bind the summaries of EditText/List/Dialog/Ringtone preferences - * to their values. When their values change, their summaries are - * updated to reflect the new value, per the Android Design - * guidelines. - */ - public void onBindPreferenceSummariesToValues() { - mHelper.onBindPreferenceSummariesToValues(); - } - - /** {@inheritDoc} */ - @Override - public void loadHeadersFromResource(int resid, List

target) { - mHelper.loadHeadersFromResource(resid, target); - } - - /** - * Parse the given XML file as a header description, adding each parsed - * LegacyHeader into the target list. - * - * @param resid The XML resource to load and parse. - * @param target The list in which the parsed headers should be placed. - */ - public void loadLegacyHeadersFromResource(int resid, List target) { - mHelper.loadLegacyHeadersFromResource(resid, target); - } -}