commit c956ca3536fb7ee9d1237c1c661bf46d95c7c9db
author Juan Ezquerro LLanes <arrase@gmail.com> Wed Jun 06 20:05:53 2018 +0200
committer Juan Ezquerro LLanes <arrase@gmail.com> Thu Jun 07 22:25:47 2018 +0200
tree db2799a6e99eeb84b38bb7b94e1028cd5eeae64c
parent 86c0fa2357f4494351837c2a2231087b0add9e6f

OmniLib: Fix SeekBarPreference xmlns

Change-Id: I3b72f9dc920959710da9d6b86535761e10b1dcae

res/values/custom_attrs.xml

diff --git a/res/values/custom_attrs.xml b/res/values/custom_attrs.xml
index ce2d08f..cd815f4 100644
--- a/res/values/custom_attrs.xml
+++ b/res/values/custom_attrs.xml
@@ -16,13 +16,13 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
 
     <declare-styleable name="SeekBarPreference">
         <attr name="min" format="integer" />
         <attr name="interval" format="integer" />
-        <attr name="unitsLeft" format="string|reference" />
-        <attr name="unitsRight" format="string|reference" />
+        <attr name="unitsLeft" format="reference" />
+        <attr name="unitsRight" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="ColorSelectPreference">

src/org/omnirom/omnilib/preference/SeekBarPreference.java

diff --git a/src/org/omnirom/omnilib/preference/SeekBarPreference.java b/src/org/omnirom/omnilib/preference/SeekBarPreference.java
index c4b356d..bf82c79 100644
--- a/src/org/omnirom/omnilib/preference/SeekBarPreference.java
+++ b/src/org/omnirom/omnilib/preference/SeekBarPreference.java
@@ -36,7 +36,7 @@
     private final String TAG = getClass().getName();
 
     private static final String ANDROIDNS = "http://schemas.android.com/apk/res/android";
-    private static final String SETTINGS = "http://schemas.android.com/apk/res/com.android.settings";
+    private static final String SETTINGS = "http://schemas.android.com/apk/lib/res/org.omnirom.omnilib";
     private static final int DEFAULT_VALUE = 50;
 
     private int mMaxValue      = 100;
@@ -59,27 +59,22 @@
     }
 
     private void initPreference(Context context, AttributeSet attrs) {
-        setValuesFromXml(attrs);
+        setValuesFromXml(context, attrs);
         setLayoutResource(R.layout.preference_seek_bar);
     }
 
-    private void setValuesFromXml(AttributeSet attrs) {
-        final TypedArray typedArray = getContext().obtainStyledAttributes(
-                      attrs, R.styleable.SeekBarPreference);
-
+    private void setValuesFromXml(Context context, AttributeSet attrs) {
         mMaxValue = attrs.getAttributeIntValue(ANDROIDNS, "max", 100);
         mMinValue = attrs.getAttributeIntValue(SETTINGS, "min", 0);
-        mUnitsLeft = getAttributeStringValue(attrs, SETTINGS, "unitsLeft", "");
-        String units = getAttributeStringValue(attrs, SETTINGS, "units", "");
-        mUnitsRight = getAttributeStringValue(attrs, SETTINGS, "unitsRight", units);
 
-        Integer id = typedArray.getResourceId(R.styleable.SeekBarPreference_unitsRight, 0);
+        Integer id = attrs.getAttributeResourceValue(SETTINGS, "unitsRight", 0);
         if (id > 0) {
-            mUnitsRight = getContext().getResources().getString(id);
+            mUnitsRight = context.getResources().getString(id);
         }
-        id = typedArray.getResourceId(R.styleable.SeekBarPreference_unitsLeft, 0);
+
+        id = attrs.getAttributeResourceValue(SETTINGS, "unitsLeft", 0);
         if (id > 0) {
-            mUnitsLeft = getContext().getResources().getString(id);
+            mUnitsLeft = context.getResources().getString(id);
         }
 
         try {
@@ -89,15 +84,6 @@
         } catch(Exception e) {
             Log.e(TAG, "Invalid interval value", e);
         }
-        typedArray.recycle();
-    }
-
-    private String getAttributeStringValue(AttributeSet attrs, String namespace, String name, String defaultValue) {
-        String value = attrs.getAttributeValue(namespace, name);
-        if(value == null) {
-            value = defaultValue;
-        }
-        return value;
     }
 
     @Override