Move mColorPicker code to src folder

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

14 files changed, 25 insertions, 2056 deletions

diff --git a/Android.mk b/Android.mk
index 2fe0643..775a89d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,6 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_SRC_FILES += $(call all-java-files-under, libs/color-picker-view/src)
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
 LOCAL_PACKAGE_NAME := PhotoPhase
diff --git a/README.md b/README.md
index 8deeadf..ed93e27 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,14 @@ A live wallpaper for Android that displays a subset of your photos on your
 wallpaper, that are rotated in small intervals of time with beautiful
 transitions and effects.
 
-This source was released under the terms of
-[Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license.
+This source was released under the terms of [Apache 2.0]
+(http://www.apache.org/licenses/LICENSE-2.0.html) license. This software includes
+third party libraries which are released under the next licenses:
+
+* Parts of code the Android Support 4.0 licensed by Google Inc. under [Apache 2.0]
+(http://www.apache.org/licenses/LICENSE-2.0.html)
+* mColorPicker licensed by Daniel Nilsson under [Apache 2.0]
+(http://www.apache.org/licenses/LICENSE-2.0.html)
 
 Visit [CyanogenMod Github](https://github.com/CyanogenMod/android_packages_wallpapers_PhotoPhase)
 and [CyanogenMod Code Review](http://review.cyanogenmod.org/) to get the source
diff --git a/libs/color-picker-view/CHANGELOG.md b/libs/color-picker-view/CHANGELOG.md
deleted file mode 100644
index 342ba60..0000000
--- a/libs/color-picker-view/CHANGELOG.md
+++ /dev/null
@@ -1,4 +0,0 @@
-ChangeLog
-========================
-
-The source was grabbed from version 1.0 (r8)
diff --git a/libs/color-picker-view/LICENSE.md b/libs/color-picker-view/LICENSE.md
deleted file mode 100644
index d645695..0000000
--- a/libs/color-picker-view/LICENSE.md
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/libs/color-picker-view/README.md b/libs/color-picker-view/README.md
deleted file mode 100644
index b26ef5a..0000000
--- a/libs/color-picker-view/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-mColorPicker
-================================
-
-A color picker is something that has always been missing from the standard
-set of components which developers can build their user interface in Android
-with. Although there have been a few color pickers floating around on the
-internet I never found any that I thought was good enough for use in my
-applications so I sat down to write my own. This is the result and I have
-decided to release it as open source application for all you developers
-out there to use, free of charge of course.
-
-Checkout latest sources at http://code.google.com/p/color-picker-view/
-
-This library is released under the [Apache 2.0]
-http://www.apache.org/licenses/LICENSE-2.0.html) license.
-
-Copyright © 2010 Daniel Nilsson
-Copyright © 2013 The CyanogenMod Project
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/drawables/AlphaPatternDrawable.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/drawables/AlphaPatternDrawable.java
deleted file mode 100644
index e878756..0000000
--- a/libs/color-picker-view/src/afzkl/development/mColorPicker/drawables/AlphaPatternDrawable.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (C) 2010 Daniel Nilsson
- *
- * 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 afzkl.development.mColorPicker.drawables;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-/**
- * This drawable that draws a simple white and gray chessboard pattern.
- * It's pattern you will often see as a background behind a
- * partly transparent image in many applications.
- * @author Daniel Nilsson
- */
-@SuppressWarnings("all")
-public class AlphaPatternDrawable extends Drawable {
-
-    private int mRectangleSize = 10;
-
-    private final Paint mPaint = new Paint();
-    private final Paint mPaintWhite = new Paint();
-    private final Paint mPaintGray = new Paint();
-
-    private int numRectanglesHorizontal;
-    private int numRectanglesVertical;
-
-    /**
-     * Bitmap in which the pattern will be cahched.
-     */
-    private Bitmap        mBitmap;
-
-    public AlphaPatternDrawable(int rectangleSize) {
-        mRectangleSize = rectangleSize;
-        mPaintWhite.setColor(0xffffffff);
-        mPaintGray.setColor(0xffcbcbcb);
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        canvas.drawBitmap(mBitmap, null, getBounds(), mPaint);
-    }
-
-    @Override
-    public int getOpacity() {
-        return 0;
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        throw new UnsupportedOperationException("Alpha is not supported by this drawwable.");
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        throw new UnsupportedOperationException("ColorFilter is not supported by this drawwable.");
-    }
-
-    @Override
-    protected void onBoundsChange(Rect bounds) {
-        super.onBoundsChange(bounds);
-
-        int height = bounds.height();
-        int width = bounds.width();
-
-        numRectanglesHorizontal = (int) Math.ceil((width / mRectangleSize));
-        numRectanglesVertical = (int) Math.ceil(height / mRectangleSize);
-
-        generatePatternBitmap();
-
-    }
-
-    /**
-     * This will generate a bitmap with the pattern
-     * as big as the rectangle we were allow to draw on.
-     * We do this to chache the bitmap so we don't need to
-     * recreate it each time draw() is called since it
-     * takes a few milliseconds.
-     */
-    private void generatePatternBitmap() {
-
-        if (getBounds().width() <= 0 || getBounds().height() <= 0) {
-            return;
-        }
-
-        mBitmap = Bitmap.createBitmap(getBounds().width(), getBounds().height(), Config.ARGB_8888);
-        Canvas canvas = new Canvas(mBitmap);
-
-        Rect r = new Rect();
-        boolean verticalStartWhite = true;
-        for (int i = 0; i <= numRectanglesVertical; i++) {
-
-            boolean isWhite = verticalStartWhite;
-            for (int j = 0; j <= numRectanglesHorizontal; j++) {
-
-                r.top = i * mRectangleSize;
-                r.left = j * mRectangleSize;
-                r.bottom = r.top + mRectangleSize;
-                r.right = r.left + mRectangleSize;
-
-                canvas.drawRect(r, isWhite ? mPaintWhite : mPaintGray);
-
-                isWhite = !isWhite;
-            }
-
-            verticalStartWhite = !verticalStartWhite;
-
-        }
-
-    }
-
-}
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
deleted file mode 100644
index ad0b9cf..0000000
--- a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod Project
- *
- * 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 afzkl.development.mColorPicker.views;
-
-import afzkl.development.mColorPicker.views.ColorPickerView.OnColorChangedListener;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.PixelFormat;
-import android.text.Editable;
-import android.text.InputFilter;
-import android.text.InputType;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * A view use directly into a dialog. It contains a one {@link ColorPickerView}
- * and two {@link ColorPanelView} (the current color and the new color)
- */
-public class ColorDialogView extends RelativeLayout
-    implements OnColorChangedListener, TextWatcher {
-
-    private static final int DEFAULT_MARGIN_DP = 16;
-    private static final int DEFAULT_PANEL_HEIGHT_DP = 32;
-    private static final int DEFAULT_TEXT_SIZE_SP = 12;
-    private static final int DEFAULT_LABEL_TEXT_SIZE_SP = 18;
-
-    private ColorPickerView mPickerView;
-    private ColorPanelView mCurrentColorView;
-    private ColorPanelView mNewColorView;
-    private TextView tvCurrent;
-    private TextView tvNew;
-    private TextView tvColorLabel;
-    private EditText etColor;
-
-    private String mCurrentLabelText = "Current:"; //$NON-NLS-1$
-    private String mNewLabelText = "New:"; //$NON-NLS-1$
-
-    private String mColorLabelText = "Color:"; //$NON-NLS-1$
-
-    private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);
-
-    /**
-     * Constructor of <code>ColorDialogView</code>
-     *
-     * @param context The current context
-     */
-    public ColorDialogView(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Constructor of <code>ColorDialogView</code>
-     *
-     * @param context The current context
-     * @param attrs The attributes of the XML tag that is inflating the view.
-     */
-    public ColorDialogView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    /**
-     * Constructor of <code>ColorDialogView</code>
-     *
-     * @param context The current context
-     * @param attrs The attributes of the XML tag that is inflating the view.
-     * @param defStyle The default style to apply to this view. If 0, no style
-     *        will be applied (beyond what is included in the theme). This may
-     *        either be an attribute resource, whose value will be retrieved
-     *        from the current theme, or an explicit style resource.
-     */
-    public ColorDialogView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init();
-    }
-
-    /**
-     * Method that initializes the view. This method loads all the necessary
-     * information and create an appropriate layout for the view
-     */
-    private void init() {
-        // To fight color branding.
-        ((Activity)getContext()).getWindow().setFormat(PixelFormat.RGBA_8888);
-
-        // Create the scrollview over the dialog
-        final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
-        ScrollView sv = new ScrollView(getContext());
-        sv.setId(internalGenerateViewId());
-        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        lp.setMargins(dlgMarging, 0, dlgMarging, 0);
-        sv.setLayoutParams(lp);
-        sv.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
-
-        // Now the vertical layout
-        LinearLayout ll = new LinearLayout(getContext());
-        ll.setId(internalGenerateViewId());
-        lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT);
-        ll.setLayoutParams(lp);
-        ll.setOrientation(LinearLayout.VERTICAL);
-        sv.addView(ll);
-
-        // Creates the color input field
-        int id = createColorInput(ll);
-
-        // Creates the color picker
-        id = createColorPicker(ll, id);
-
-        // Creates the current color and new color panels
-        id = createColorsPanel(ll, id);
-
-        // Add the scrollview
-        addView(sv);
-
-        // Sets the input color
-        this.etColor.setText(toHex(this.mNewColorView.getColor()));
-    }
-
-    /**
-     * Method that creates the color input
-     *
-     * @param parent The parent layout
-     */
-    private int createColorInput(ViewGroup parent) {
-        final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
-        LinearLayout.LayoutParams lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT);
-        lp2.setMargins(0, 0, dlgMarging, 0);
-        this.tvColorLabel = new TextView(getContext());
-        this.tvColorLabel.setText(this.mColorLabelText);
-        this.tvColorLabel.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_LABEL_TEXT_SIZE_SP);
-        this.tvColorLabel.setGravity(Gravity.BOTTOM | Gravity.LEFT);
-        this.tvColorLabel.setLayoutParams(lp2);
-
-        lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        this.etColor = new EditText(getContext());
-        this.etColor.setSingleLine();
-        this.etColor.setGravity(Gravity.TOP | Gravity.LEFT);
-        this.etColor.setCursorVisible(true);
-        this.etColor.setImeOptions(
-                EditorInfo.IME_ACTION_DONE | EditorInfo.IME_FLAG_NO_FULLSCREEN);
-        this.etColor.setInputType(
-                InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
-        this.etColor.setLayoutParams(lp2);
-        InputFilter[] filters = new InputFilter[2];
-        filters[0] = new InputFilter.LengthFilter(8);
-        filters[1] = new InputFilter() {
-            @Override
-            public CharSequence filter(CharSequence source, int start,
-                    int end, Spanned dest, int dstart, int dend) {
-                if (start >= end) return ""; //$NON-NLS-1$
-                String s = source.subSequence(start, end).toString();
-                StringBuilder sb = new StringBuilder();
-                int cc = s.length();
-                for (int i = 0; i < cc; i++) {
-                    char c = s.charAt(i);
-                    if ((c >= '0' && c <= '9') ||
-                        (c >= 'a' && c <= 'f') ||
-                        (c >= 'A' && c <= 'F')) {
-                        sb.append(c);
-                    }
-                }
-                return sb.toString().toUpperCase(Locale.getDefault());
-            }
-        };
-        this.etColor.setFilters(filters);
-        this.etColor.addTextChangedListener(this);
-
-        LinearLayout ll1 = new LinearLayout(getContext());
-        ll1.setId(internalGenerateViewId());
-        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        lp.setMargins(dlgMarging, 0, dlgMarging, 0);
-        lp.addRule(RelativeLayout.ALIGN_PARENT_TOP);
-        ll1.setLayoutParams(lp);
-        ll1.addView(this.tvColorLabel);
-        ll1.addView(this.etColor);
-        parent.addView(ll1);
-
-        return ll1.getId();
-    }
-
-    /**
-     * Method that creates the color picker
-     *
-     * @param parent The parent layout
-     * @param belowOf The anchor view
-     * @return id The layout id
-     */
-    private int createColorPicker(ViewGroup parent, int belowOf) {
-        final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
-        this.mPickerView = new ColorPickerView(getContext());
-        this.mPickerView.setId(internalGenerateViewId());
-        this.mPickerView.setOnColorChangedListener(this);
-        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        lp.setMargins(dlgMarging, 0, dlgMarging, 0);
-        lp.addRule(RelativeLayout.BELOW, belowOf);
-        this.mPickerView.setLayoutParams(lp);
-        parent.addView(this.mPickerView);
-        return this.mPickerView.getId();
-    }
-
-    /**
-     * Method that creates the colors panel (current and new)
-     *
-     * @param parent The parent layout
-     * @param belowOf The anchor view
-     * @return id The layout id
-     */
-    private int createColorsPanel(ViewGroup parent, int belowOf) {
-        final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
-        final int panelHeight = (int)convertDpToPixel(DEFAULT_PANEL_HEIGHT_DP);
-        LinearLayout.LayoutParams lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                1);
-
-        // Titles
-        this.tvCurrent = new TextView(getContext());
-        lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                1);
-        this.tvCurrent.setLayoutParams(lp2);
-        this.tvCurrent.setText(this.mCurrentLabelText);
-        this.tvCurrent.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
-        this.tvNew = new TextView(getContext());
-        this.tvNew.setLayoutParams(lp2);
-        this.tvNew.setText(this.mNewLabelText);
-        this.tvNew.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
-        TextView sep1 = new TextView(getContext());
-        lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                0);
-        lp2.setMargins(dlgMarging, 0, dlgMarging, 0);
-        sep1.setLayoutParams(lp2);
-        sep1.setText(" "); //$NON-NLS-1$
-        sep1.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
-
-        LinearLayout ll1 = new LinearLayout(getContext());
-        ll1.setId(internalGenerateViewId());
-        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
-        lp.setMargins(dlgMarging, 0, dlgMarging, dlgMarging/2);
-        lp.addRule(RelativeLayout.BELOW, belowOf);
-        ll1.setLayoutParams(lp);
-        ll1.addView(this.tvCurrent);
-        ll1.addView(sep1);
-        ll1.addView(this.tvNew);
-        parent.addView(ll1);
-
-        // Color panels
-        lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                1);
-        this.mCurrentColorView = new ColorPanelView(getContext());
-        this.mCurrentColorView.setLayoutParams(lp2);
-        this.mNewColorView = new ColorPanelView(getContext());
-        this.mNewColorView.setLayoutParams(lp2);
-        TextView sep2 = new TextView(getContext());
-        lp2 = new LinearLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
-                0);
-        lp2.setMargins(dlgMarging, 0, dlgMarging, 0);
-        sep2.setLayoutParams(lp2);
-        sep2.setText("-"); //$NON-NLS-1$
-        sep2.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
-
-        LinearLayout ll2 = new LinearLayout(getContext());
-        ll2.setId(internalGenerateViewId());
-        lp = new RelativeLayout.LayoutParams(
-                android.view.ViewGroup.LayoutParams.MATCH_PARENT, panelHeight);
-        lp.setMargins(dlgMarging, 0, dlgMarging, dlgMarging/2);
-        lp.addRule(RelativeLayout.BELOW, ll1.getId());
-        ll2.setLayoutParams(lp);
-        ll2.addView(this.mCurrentColorView);
-        ll2.addView(sep2);
-        ll2.addView(this.mNewColorView);
-        parent.addView(ll2);
-
-        return ll2.getId();
-    }
-
-    /**
-     * Method that returns the color of the picker
-     *
-     * @return The ARGB color
-     */
-    public int getColor() {
-        return this.mPickerView.getColor();
-    }
-
-    /**
-     * Method that set the color of the picker
-     *
-     * @param argb The ARGB color
-     */
-    public void setColor(int argb) {
-        setColor(argb, false);
-    }
-
-    /**
-     * Method that set the color of the picker
-     *
-     * @param argb The ARGB color
-     * @param fromEditText If the call comes from the <code>EditText</code>
-     */
-    private void setColor(int argb, boolean fromEditText) {
-        this.mPickerView.setColor(argb, false);
-        this.mCurrentColorView.setColor(argb);
-        this.mNewColorView.setColor(argb);
-        if (!fromEditText) {
-            this.etColor.setText(toHex(this.mNewColorView.getColor()));
-        }
-    }
-
-    /**
-     * Method that display/hide the alpha slider
-     *
-     * @param show If the alpha slider should be shown
-     */
-    public void showAlphaSlider(boolean show) {
-        this.mPickerView.setAlphaSliderVisible(show);
-    }
-
-    /**
-     * Set the text that should be shown in the alpha slider.
-     * Set to null to disable text.
-     *
-     * @param text Text that should be shown.
-     */
-    public void setAlphaSliderText(String text) {
-        this.mPickerView.setAlphaSliderText(text);
-    }
-
-    /**
-     * Set the text that should be shown in the actual color panel.
-     * Set to null to disable text.
-     *
-     * @param text Text that should be shown.
-     */
-    public void setCurrentColorText(String text) {
-        this.mCurrentLabelText = text;
-        this.tvCurrent.setText(this.mCurrentLabelText);
-    }
-
-    /**
-     * Set the text that should be shown in the new color panel.
-     * Set to null to disable text.
-     *
-     * @param text Text that should be shown.
-     */
-    public void setNewColorText(String text) {
-        this.mNewLabelText = text;
-        this.tvNew.setText(this.mNewLabelText);
-    }
-
-    /**
-     * Set the text that should be shown in the label of the color input.
-     * Set to null to disable text.
-     *
-     * @param text Text that should be shown.
-     */
-    public void setColorLabelText(String text) {
-        this.mColorLabelText = text;
-        this.tvColorLabel.setText(this.mColorLabelText);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onColorChanged(int color) {
-        this.mNewColorView.setColor(color);
-        this.etColor.removeTextChangedListener(this);
-        this.etColor.setText(toHex(this.mNewColorView.getColor()));
-        this.etColor.addTextChangedListener(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {/**NON BLOCK**/}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {/**NON BLOCK**/}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void afterTextChanged(Editable s) {
-        if (s.length() == 8) {
-            try {
-                setColor(toARGB(s.toString()), true);
-            } catch (Exception e) {/**NON BLOCK**/}
-        }
-    }
-
-    /**
-     * This method converts dp unit to equivalent device specific value in pixels.
-     *
-     * @param ctx The current context
-     * @param dp A value in dp (Device independent pixels) unit
-     * @return float A float value to represent Pixels equivalent to dp according to device
-     */
-    private float convertDpToPixel(float dp) {
-        Resources resources = getContext().getResources();
-        DisplayMetrics metrics = resources.getDisplayMetrics();
-        return dp * (metrics.densityDpi / 160f);
-    }
-
-    /**
-     * Method that converts an ARGB color to its hex string color representation
-     *
-     * @param argb The ARGB color
-     * @return String The hex string representation of the color
-     */
-    private static String toHex(int argb) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(toHexString((byte)Color.alpha(argb)));
-        sb.append(toHexString((byte)Color.red(argb)));
-        sb.append(toHexString((byte)Color.green(argb)));
-        sb.append(toHexString((byte)Color.blue(argb)));
-        return sb.toString();
-    }
-
-    /**
-     * Method that converts an hex string color representation to an ARGB color
-     *
-     * @param hex The hex string representation of the color
-     * @return int The ARGB color
-     */
-    private static int toARGB(String hex) {
-        return Color.parseColor("#" + hex); //$NON-NLS-1$
-    }
-
-    /**
-     * Method that converts a byte into its hex string representation
-     *
-     * @param v The value to convert
-     * @return String The hex string representation
-     */
-    private static String toHexString(byte v) {
-        String hex = Integer.toHexString(v & 0xff);
-        if (hex.length() == 1) {
-            hex = "0" + hex; //$NON-NLS-1$
-        }
-        return hex.toUpperCase(Locale.getDefault());
-    }
-
-    /**
-     * Generate a value suitable for use in {@link #setId(int)}.
-     * This value will not collide with ID values generated at build time by aapt for R.id.
-     *
-     * @return a generated ID value
-     */
-    private static int internalGenerateViewId() {
-        for (;;) {
-            final int result = sNextGeneratedId.get();
-            // aapt-generated IDs have the high byte nonzero; clamp to the range under that.
-            int newValue = result + 1;
-            if (newValue > 0x00FFFFFF) newValue = 1; // Roll over to 1, not 0.
-            if (sNextGeneratedId.compareAndSet(result, newValue)) {
-                return result;
-            }
-        }
-    }
-}
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPanelView.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPanelView.java
deleted file mode 100644
index 9764ff1..0000000
--- a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPanelView.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2010 Daniel Nilsson
- *
- * 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 afzkl.development.mColorPicker.views;
-
-import afzkl.development.mColorPicker.drawables.AlphaPatternDrawable;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.util.AttributeSet;
-import android.view.View;
-
-/**
- * This class draws a panel which which will be filled with a color which can be set.
- * It can be used to show the currently selected color which you will get from
- * the {@link ColorPickerView}.
- * @author Daniel Nilsson
- *
- */
-@SuppressWarnings("all")
-public class ColorPanelView extends View{
-
-    /**
-     * The width in pixels of the border
-     * surrounding the color panel.
-     */
-    private final static float    BORDER_WIDTH_PX = 1;
-
-    private static float mDensity = 1f;
-
-    private int         mBorderColor = 0xff6E6E6E;
-    private int         mColor = 0xff000000;
-
-    private Paint        mBorderPaint;
-    private Paint        mColorPaint;
-
-    private RectF        mDrawingRect;
-    private RectF        mColorRect;
-
-    private AlphaPatternDrawable mAlphaPattern;
-
-
-    public ColorPanelView(Context context) {
-        this(context, null);
-    }
-
-    public ColorPanelView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public ColorPanelView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        init();
-    }
-
-    private void init() {
-        mBorderPaint = new Paint();
-        mColorPaint = new Paint();
-        mDensity = getContext().getResources().getDisplayMetrics().density;
-    }
-
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-
-        final RectF    rect = mColorRect;
-
-        if (BORDER_WIDTH_PX > 0) {
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawRect(mDrawingRect, mBorderPaint);
-        }
-
-        if (mAlphaPattern != null) {
-            mAlphaPattern.draw(canvas);
-        }
-
-        mColorPaint.setColor(mColor);
-
-        canvas.drawRect(rect, mColorPaint);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
-        int width = MeasureSpec.getSize(widthMeasureSpec);
-        int height = MeasureSpec.getSize(heightMeasureSpec);
-
-        setMeasuredDimension(width, height);
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        mDrawingRect = new RectF();
-        mDrawingRect.left =  getPaddingLeft();
-        mDrawingRect.right  = w - getPaddingRight();
-        mDrawingRect.top = getPaddingTop();
-        mDrawingRect.bottom = h - getPaddingBottom();
-
-        setUpColorRect();
-
-    }
-
-    private void setUpColorRect() {
-        final RectF    dRect = mDrawingRect;
-
-        float left = dRect.left + BORDER_WIDTH_PX;
-        float top = dRect.top + BORDER_WIDTH_PX;
-        float bottom = dRect.bottom - BORDER_WIDTH_PX;
-        float right = dRect.right - BORDER_WIDTH_PX;
-
-        mColorRect = new RectF(left,top, right, bottom);
-
-        mAlphaPattern = new AlphaPatternDrawable((int)(5 * mDensity));
-
-        mAlphaPattern.setBounds(Math.round(mColorRect.left),
-                Math.round(mColorRect.top),
-                Math.round(mColorRect.right),
-                Math.round(mColorRect.bottom));
-
-    }
-
-    /**
-     * Set the color that should be shown by this view.
-     * @param color
-     */
-    public void setColor(int color) {
-        mColor = color;
-        invalidate();
-    }
-
-    /**
-     * Get the color currently show by this view.
-     * @return
-     */
-    public int getColor() {
-        return mColor;
-    }
-
-    /**
-     * Set the color of the border surrounding the panel.
-     * @param color
-     */
-    public void setBorderColor(int color) {
-        mBorderColor = color;
-        invalidate();
-    }
-
-    /**
-     * Get the color of the border surrounding the panel.
-     */
-    public int getBorderColor() {
-        return mBorderColor;
-    }
-
-}
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPickerView.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPickerView.java
deleted file mode 100644
index fd901c5..0000000
--- a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorPickerView.java
+++ /dev/null
@@ -1,998 +0,0 @@
-/*
- * Copyright (C) 2010 Daniel Nilsson
- *
- * 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 afzkl.development.mColorPicker.views;
-
-import afzkl.development.mColorPicker.drawables.AlphaPatternDrawable;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ComposeShader;
-import android.graphics.LinearGradient;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Paint.Style;
-import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.graphics.Shader.TileMode;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import java.lang.reflect.Method;
-
-/**
- * Displays a color picker to the user and allow them
- * to select a color. A slider for the alpha channel is
- * also available. Enable it by setting
- * setAlphaSliderVisible(boolean) to true.
- * @author Daniel Nilsson
- */
-@SuppressWarnings("all")
-public class ColorPickerView extends View{
-
-    public interface OnColorChangedListener{
-        public void onColorChanged(int color);
-    }
-
-    private final static int    PANEL_SAT_VAL = 0;
-    private final static int    PANEL_HUE = 1;
-    private final static int    PANEL_ALPHA = 2;
-
-    /**
-     * The width in pixels of the border
-     * surrounding all color panels.
-     */
-    private final static float    BORDER_WIDTH_PX = 1;
-
-    /**
-     * The width in dp of the hue panel.
-     */
-    private float         HUE_PANEL_WIDTH = 30f;
-    /**
-     * The height in dp of the alpha panel
-     */
-    private float        ALPHA_PANEL_HEIGHT = 20f;
-    /**
-     * The distance in dp between the different
-     * color panels.
-     */
-    private float         PANEL_SPACING = 10f;
-    /**
-     * The radius in dp of the color palette tracker circle.
-     */
-    private float         PALETTE_CIRCLE_TRACKER_RADIUS = 5f;
-    /**
-     * The dp which the tracker of the hue or alpha panel
-     * will extend outside of its bounds.
-     */
-    private float        RECTANGLE_TRACKER_OFFSET = 2f;
-
-
-    private static float mDensity = 1f;
-
-    private OnColorChangedListener    mListener;
-
-    private Paint         mSatValPaint;
-    private Paint        mSatValTrackerPaint;
-
-    private Paint        mHuePaint;
-    private Paint        mHueTrackerPaint;
-
-    private Paint        mAlphaPaint;
-    private Paint        mAlphaTextPaint;
-
-    private Paint        mBorderPaint;
-
-    private Shader        mValShader;
-    private Shader        mSatShader;
-    private Shader        mHueShader;
-    private Shader        mAlphaShader;
-
-    private int            mAlpha = 0xff;
-    private float        mHue = 360f;
-    private float         mSat = 0f;
-    private float         mVal = 0f;
-
-    private String        mAlphaSliderText = "Alpha";
-    private int         mSliderTrackerColor = 0xff1c1c1c;
-    private int         mBorderColor = 0xff6E6E6E;
-    private boolean        mShowAlphaPanel = false;
-
-    /*
-     * To remember which panel that has the "focus" when
-     * processing hardware button data.
-     */
-    private int            mLastTouchedPanel = PANEL_SAT_VAL;
-
-    /**
-     * Offset from the edge we must have or else
-     * the finger tracker will get clipped when
-     * it is drawn outside of the view.
-     */
-    private float         mDrawingOffset;
-
-
-    /*
-     * Distance form the edges of the view
-     * of where we are allowed to draw.
-     */
-    private RectF    mDrawingRect;
-
-    private RectF    mSatValRect;
-    private RectF     mHueRect;
-    private RectF    mAlphaRect;
-
-    private AlphaPatternDrawable    mAlphaPattern;
-
-    private Point    mStartTouchPoint = null;
-
-
-    public ColorPickerView(Context context) {
-        this(context, null);
-    }
-
-    public ColorPickerView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public ColorPickerView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init();
-    }
-
-    private void init() {
-        mDensity = getContext().getResources().getDisplayMetrics().density;
-        PALETTE_CIRCLE_TRACKER_RADIUS *= mDensity;
-        RECTANGLE_TRACKER_OFFSET *= mDensity;
-        HUE_PANEL_WIDTH *= mDensity;
-        ALPHA_PANEL_HEIGHT *= mDensity;
-        PANEL_SPACING = PANEL_SPACING * mDensity;
-
-        mDrawingOffset = calculateRequiredOffset();
-
-        initPaintTools();
-
-        //Needed for receiving trackball motion events.
-        setFocusable(true);
-        setFocusableInTouchMode(true);
-    }
-
-    private void initPaintTools() {
-
-        mSatValPaint = new Paint();
-        mSatValTrackerPaint = new Paint();
-        mHuePaint = new Paint();
-        mHueTrackerPaint = new Paint();
-        mAlphaPaint = new Paint();
-        mAlphaTextPaint = new Paint();
-        mBorderPaint = new Paint();
-
-
-        mSatValTrackerPaint.setStyle(Style.STROKE);
-        mSatValTrackerPaint.setStrokeWidth(2f * mDensity);
-        mSatValTrackerPaint.setAntiAlias(true);
-
-        mHueTrackerPaint.setColor(mSliderTrackerColor);
-        mHueTrackerPaint.setStyle(Style.STROKE);
-        mHueTrackerPaint.setStrokeWidth(2f * mDensity);
-        mHueTrackerPaint.setAntiAlias(true);
-
-        mAlphaTextPaint.setColor(0xff1c1c1c);
-        mAlphaTextPaint.setTextSize(14f * mDensity);
-        mAlphaTextPaint.setAntiAlias(true);
-        mAlphaTextPaint.setTextAlign(Align.CENTER);
-        mAlphaTextPaint.setFakeBoldText(true);
-
-
-    }
-
-    private float calculateRequiredOffset() {
-        float offset = Math.max(PALETTE_CIRCLE_TRACKER_RADIUS, RECTANGLE_TRACKER_OFFSET);
-        offset = Math.max(offset, BORDER_WIDTH_PX * mDensity);
-
-        return offset * 1.5f;
-    }
-
-    private int[] buildHueColorArray() {
-
-        int[] hue = new int[361];
-
-        int count = 0;
-        for (int i = hue.length -1; i >= 0; i--, count++) {
-            hue[count] = Color.HSVToColor(new float[]{i, 1f, 1f});
-        }
-
-        return hue;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        checkHardwareAccelerationSupport();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-
-        if (mDrawingRect.width() <= 0 || mDrawingRect.height() <= 0) return;
-
-        drawSatValPanel(canvas);
-        drawHuePanel(canvas);
-        drawAlphaPanel(canvas);
-
-    }
-
-    private void drawSatValPanel(Canvas canvas) {
-
-        final RectF    rect = mSatValRect;
-
-        if (BORDER_WIDTH_PX > 0) {
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawRect(mDrawingRect.left, mDrawingRect.top, rect.right + BORDER_WIDTH_PX, rect.bottom + BORDER_WIDTH_PX, mBorderPaint);
-        }
-
-        if (mValShader == null) {
-            mValShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom,
-                    0xffffffff, 0xff000000, TileMode.CLAMP);
-        }
-
-        int rgb = Color.HSVToColor(new float[]{mHue,1f,1f});
-
-        mSatShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top,
-                0xffffffff, rgb, TileMode.CLAMP);
-        ComposeShader mShader = new ComposeShader(mValShader, mSatShader, PorterDuff.Mode.MULTIPLY);
-        mSatValPaint.setShader(mShader);
-
-        canvas.drawRect(rect, mSatValPaint);
-
-        Point p = satValToPoint(mSat, mVal);
-
-        mSatValTrackerPaint.setColor(0xff000000);
-        canvas.drawCircle(p.x, p.y, PALETTE_CIRCLE_TRACKER_RADIUS - 1f * mDensity, mSatValTrackerPaint);
-
-        mSatValTrackerPaint.setColor(0xffdddddd);
-        canvas.drawCircle(p.x, p.y, PALETTE_CIRCLE_TRACKER_RADIUS, mSatValTrackerPaint);
-
-    }
-
-    private void drawHuePanel(Canvas canvas) {
-
-        final RectF rect = mHueRect;
-
-        if (BORDER_WIDTH_PX > 0) {
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawRect(rect.left - BORDER_WIDTH_PX,
-                    rect.top - BORDER_WIDTH_PX,
-                    rect.right + BORDER_WIDTH_PX,
-                    rect.bottom + BORDER_WIDTH_PX,
-                    mBorderPaint);
-        }
-
-        if (mHueShader == null) {
-            mHueShader = new LinearGradient(rect.left, rect.top, rect.left, rect.bottom, buildHueColorArray(), null, TileMode.CLAMP);
-            mHuePaint.setShader(mHueShader);
-        }
-
-        canvas.drawRect(rect, mHuePaint);
-
-        float rectHeight = 4 * mDensity / 2;
-
-        Point p = hueToPoint(mHue);
-
-        RectF r = new RectF();
-        r.left = rect.left - RECTANGLE_TRACKER_OFFSET;
-        r.right = rect.right + RECTANGLE_TRACKER_OFFSET;
-        r.top = p.y - rectHeight;
-        r.bottom = p.y + rectHeight;
-
-
-        canvas.drawRoundRect(r, 2, 2, mHueTrackerPaint);
-
-    }
-
-    private void drawAlphaPanel(Canvas canvas) {
-
-        if (!mShowAlphaPanel || mAlphaRect == null || mAlphaPattern == null) return;
-
-        final RectF rect = mAlphaRect;
-
-        if (BORDER_WIDTH_PX > 0) {
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawRect(rect.left - BORDER_WIDTH_PX,
-                    rect.top - BORDER_WIDTH_PX,
-                    rect.right + BORDER_WIDTH_PX,
-                    rect.bottom + BORDER_WIDTH_PX,
-                    mBorderPaint);
-        }
-
-
-        mAlphaPattern.draw(canvas);
-
-        float[] hsv = new float[]{mHue,mSat,mVal};
-        int color = Color.HSVToColor(hsv);
-        int acolor = Color.HSVToColor(0, hsv);
-
-        mAlphaShader = new LinearGradient(rect.left, rect.top, rect.right, rect.top,
-                color, acolor, TileMode.CLAMP);
-
-
-        mAlphaPaint.setShader(mAlphaShader);
-
-        canvas.drawRect(rect, mAlphaPaint);
-
-        if (mAlphaSliderText != null && mAlphaSliderText!= "") {
-            canvas.drawText(mAlphaSliderText, rect.centerX(), rect.centerY() + 4 * mDensity, mAlphaTextPaint);
-        }
-
-        float rectWidth = 4 * mDensity / 2;
-
-        Point p = alphaToPoint(mAlpha);
-
-        RectF r = new RectF();
-        r.left = p.x - rectWidth;
-        r.right = p.x + rectWidth;
-        r.top = rect.top - RECTANGLE_TRACKER_OFFSET;
-        r.bottom = rect.bottom + RECTANGLE_TRACKER_OFFSET;
-
-        canvas.drawRoundRect(r, 2, 2, mHueTrackerPaint);
-
-    }
-
-
-    private Point hueToPoint(float hue) {
-
-        final RectF rect = mHueRect;
-        final float height = rect.height();
-
-        Point p = new Point();
-
-        p.y = (int) (height - (hue * height / 360f) + rect.top);
-        p.x = (int) rect.left;
-
-        return p;
-    }
-
-    private Point satValToPoint(float sat, float val) {
-
-        final RectF rect = mSatValRect;
-        final float height = rect.height();
-        final float width = rect.width();
-
-        Point p = new Point();
-
-        p.x = (int) (sat * width + rect.left);
-        p.y = (int) ((1f - val) * height + rect.top);
-
-        return p;
-    }
-
-    private Point alphaToPoint(int alpha) {
-
-        final RectF rect = mAlphaRect;
-        final float width = rect.width();
-
-        Point p = new Point();
-
-        p.x = (int) (width - (alpha * width / 0xff) + rect.left);
-        p.y = (int) rect.top;
-
-        return p;
-
-    }
-
-    private float[] pointToSatVal(float x, float y) {
-
-        final RectF rect = mSatValRect;
-        float[] result = new float[2];
-
-        float width = rect.width();
-        float height = rect.height();
-
-        if (x < rect.left) {
-            x = 0f;
-        }
-        else if (x > rect.right) {
-            x = width;
-        }
-        else{
-            x = x - rect.left;
-        }
-
-        if (y < rect.top) {
-            y = 0f;
-        }
-        else if (y > rect.bottom) {
-            y = height;
-        }
-        else{
-            y = y - rect.top;
-        }
-
-
-        result[0] = 1.f / width * x;
-        result[1] = 1.f - (1.f / height * y);
-
-        return result;
-    }
-
-    private float pointToHue(float y) {
-
-        final RectF rect = mHueRect;
-
-        float height = rect.height();
-
-        if (y < rect.top) {
-            y = 0f;
-        }
-        else if (y > rect.bottom) {
-            y = height;
-        }
-        else{
-            y = y - rect.top;
-        }
-
-        return 360f - (y * 360f / height);
-    }
-
-    private int pointToAlpha(int x) {
-
-        final RectF rect = mAlphaRect;
-        final int width = (int) rect.width();
-
-        if (x < rect.left) {
-            x = 0;
-        }
-        else if (x > rect.right) {
-            x = width;
-        }
-        else{
-            x = x - (int)rect.left;
-        }
-
-        return 0xff - (x * 0xff / width);
-
-    }
-
-
-    @Override
-    public boolean onTrackballEvent(MotionEvent event) {
-
-        float x = event.getX();
-        float y = event.getY();
-
-        boolean update = false;
-
-
-        if (event.getAction() == MotionEvent.ACTION_MOVE) {
-
-            switch(mLastTouchedPanel) {
-
-            case PANEL_SAT_VAL:
-
-                float sat, val;
-
-                sat = mSat + x/50f;
-                val = mVal - y/50f;
-
-                if (sat < 0f) {
-                    sat = 0f;
-                }
-                else if (sat > 1f) {
-                    sat = 1f;
-                }
-
-                if (val < 0f) {
-                    val = 0f;
-                }
-                else if (val > 1f) {
-                    val = 1f;
-                }
-
-                mSat = sat;
-                mVal = val;
-
-                update = true;
-
-                break;
-
-            case PANEL_HUE:
-
-                float hue = mHue - y * 10f;
-
-                if (hue < 0f) {
-                    hue = 0f;
-                }
-                else if (hue > 360f) {
-                    hue = 360f;
-                }
-
-                mHue = hue;
-
-                update = true;
-
-                break;
-
-            case PANEL_ALPHA:
-
-                if (!mShowAlphaPanel || mAlphaRect == null) {
-                    update = false;
-                }
-                else{
-
-                    int alpha = (int) (mAlpha - x*10);
-
-                    if (alpha < 0) {
-                        alpha = 0;
-                    }
-                    else if (alpha > 0xff) {
-                        alpha = 0xff;
-                    }
-
-                    mAlpha = alpha;
-
-
-                    update = true;
-                }
-
-                break;
-            }
-
-
-        }
-
-
-        if (update) {
-
-            if (mListener != null) {
-                mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
-            }
-
-            invalidate();
-            return true;
-        }
-
-
-        return super.onTrackballEvent(event);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-
-        boolean update = false;
-
-        switch(event.getAction()) {
-
-        case MotionEvent.ACTION_DOWN:
-
-            mStartTouchPoint = new Point((int)event.getX(), (int)event.getY());
-
-            update = moveTrackersIfNeeded(event);
-
-            break;
-
-        case MotionEvent.ACTION_MOVE:
-
-            update = moveTrackersIfNeeded(event);
-
-            break;
-
-        case MotionEvent.ACTION_UP:
-
-            mStartTouchPoint = null;
-
-            update = moveTrackersIfNeeded(event);
-
-            break;
-
-        }
-
-        if (update) {
-
-            if (mListener != null) {
-                mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
-            }
-
-            invalidate();
-            return true;
-        }
-
-
-        return super.onTouchEvent(event);
-    }
-
-    private boolean moveTrackersIfNeeded(MotionEvent event) {
-
-        if (mStartTouchPoint == null) return false;
-
-        boolean update = false;
-
-        int startX = mStartTouchPoint.x;
-        int startY = mStartTouchPoint.y;
-
-
-        if (mHueRect.contains(startX, startY)) {
-            mLastTouchedPanel = PANEL_HUE;
-
-            mHue = pointToHue(event.getY());
-
-            update = true;
-        }
-        else if (mSatValRect.contains(startX, startY)) {
-
-            mLastTouchedPanel = PANEL_SAT_VAL;
-
-            float[] result = pointToSatVal(event.getX(), event.getY());
-
-            mSat = result[0];
-            mVal = result[1];
-
-            update = true;
-        }
-        else if (mAlphaRect != null && mAlphaRect.contains(startX, startY)) {
-
-            mLastTouchedPanel = PANEL_ALPHA;
-
-            mAlpha = pointToAlpha((int)event.getX());
-
-            update = true;
-        }
-
-
-        return update;
-    }
-
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
-        int width = 0;
-        int height = 0;
-
-        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        int widthAllowed = MeasureSpec.getSize(widthMeasureSpec);
-        int heightAllowed = MeasureSpec.getSize(heightMeasureSpec);
-
-
-        widthAllowed = chooseWidth(widthMode, widthAllowed);
-        heightAllowed = chooseHeight(heightMode, heightAllowed);
-
-
-        if (!mShowAlphaPanel) {
-            height = (int) (widthAllowed - PANEL_SPACING - HUE_PANEL_WIDTH);
-
-            //If calculated height (based on the width) is more than the allowed height.
-            if (height > heightAllowed) {
-                height = heightAllowed;
-                width = (int) (height + PANEL_SPACING + HUE_PANEL_WIDTH);
-            }
-            else{
-                width = widthAllowed;
-            }
-        }
-        else{
-
-            width = (int) (heightAllowed - ALPHA_PANEL_HEIGHT + HUE_PANEL_WIDTH);
-
-            if (width > widthAllowed) {
-                width = widthAllowed;
-                height = (int) (widthAllowed - HUE_PANEL_WIDTH + ALPHA_PANEL_HEIGHT);
-            }
-            else{
-                height = heightAllowed;
-            }
-
-
-        }
-
-
-        setMeasuredDimension(width, height);
-    }
-
-    private int chooseWidth(int mode, int size) {
-        if (mode == MeasureSpec.AT_MOST || mode == MeasureSpec.EXACTLY) {
-            return size;
-        } else { // (mode == MeasureSpec.UNSPECIFIED)
-            return getPrefferedWidth();
-        }
-    }
-
-    private int chooseHeight(int mode, int size) {
-        if (mode == MeasureSpec.AT_MOST || mode == MeasureSpec.EXACTLY) {
-            return size;
-        } else { // (mode == MeasureSpec.UNSPECIFIED)
-            return getPreferedHeight();
-        }
-    }
-
-    private int getPrefferedWidth() {
-
-        int width = getPreferedHeight();
-
-        if (mShowAlphaPanel) {
-            width -= (PANEL_SPACING + ALPHA_PANEL_HEIGHT);
-        }
-
-
-        return (int) (width + HUE_PANEL_WIDTH + PANEL_SPACING);
-
-    }
-
-    private int getPreferedHeight() {
-
-        int height = (int)(200 * mDensity);
-
-        if (mShowAlphaPanel) {
-            height += PANEL_SPACING + ALPHA_PANEL_HEIGHT;
-        }
-
-        return height;
-    }
-
-
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        mDrawingRect = new RectF();
-        mDrawingRect.left = mDrawingOffset + getPaddingLeft();
-        mDrawingRect.right  = w - mDrawingOffset - getPaddingRight();
-        mDrawingRect.top = mDrawingOffset + getPaddingTop();
-        mDrawingRect.bottom = h - mDrawingOffset - getPaddingBottom();
-
-        setUpSatValRect();
-        setUpHueRect();
-        setUpAlphaRect();
-    }
-
-    private void setUpSatValRect() {
-
-        final RectF    dRect = mDrawingRect;
-        float panelSide = dRect.height() - BORDER_WIDTH_PX * 2;
-
-        if (mShowAlphaPanel) {
-            panelSide -= PANEL_SPACING + ALPHA_PANEL_HEIGHT;
-        }
-
-        float left = dRect.left + BORDER_WIDTH_PX;
-        float top = dRect.top + BORDER_WIDTH_PX;
-        float bottom = top + panelSide;
-        float right = left + panelSide;
-
-        mSatValRect = new RectF(left,top, right, bottom);
-    }
-
-    private void setUpHueRect() {
-        final RectF    dRect = mDrawingRect;
-
-        float left = dRect.right - HUE_PANEL_WIDTH + BORDER_WIDTH_PX;
-        float top = dRect.top + BORDER_WIDTH_PX;
-        float bottom = dRect.bottom - BORDER_WIDTH_PX - (mShowAlphaPanel ? (PANEL_SPACING + ALPHA_PANEL_HEIGHT) : 0);
-        float right = dRect.right - BORDER_WIDTH_PX;
-
-        mHueRect = new RectF(left, top, right, bottom);
-    }
-
-    private void setUpAlphaRect() {
-
-        if (!mShowAlphaPanel) return;
-
-        final RectF    dRect = mDrawingRect;
-
-        float left = dRect.left + BORDER_WIDTH_PX;
-        float top = dRect.bottom - ALPHA_PANEL_HEIGHT + BORDER_WIDTH_PX;
-        float bottom = dRect.bottom - BORDER_WIDTH_PX;
-        float right = dRect.right - BORDER_WIDTH_PX;
-
-        mAlphaRect = new RectF(left, top, right, bottom);
-
-
-        mAlphaPattern = new AlphaPatternDrawable((int) (5 * mDensity));
-        mAlphaPattern.setBounds(Math.round(mAlphaRect.left), Math
-                .round(mAlphaRect.top), Math.round(mAlphaRect.right), Math
-                .round(mAlphaRect.bottom));
-
-
-
-    }
-
-
-    /**
-     * Set a OnColorChangedListener to get notified when the color
-     * selected by the user has changed.
-     * @param listener
-     */
-    public void setOnColorChangedListener(OnColorChangedListener listener) {
-        mListener = listener;
-    }
-
-    /**
-     * Set the color of the border surrounding all panels.
-     * @param color
-     */
-    public void setBorderColor(int color) {
-        mBorderColor = color;
-        invalidate();
-    }
-
-    /**
-     * Get the color of the border surrounding all panels.
-     */
-    public int getBorderColor() {
-        return mBorderColor;
-    }
-
-    /**
-     * Get the current color this view is showing.
-     * @return the current color.
-     */
-    public int getColor() {
-        return Color.HSVToColor(mAlpha, new float[]{mHue,mSat,mVal});
-    }
-
-    /**
-     * Set the color the view should show.
-     * @param color The color that should be selected.
-     */
-    public void setColor(int color) {
-        setColor(color, false);
-    }
-
-    /**
-     * Set the color this view should show.
-     * @param color The color that should be selected.
-     * @param callback If you want to get a callback to
-     * your OnColorChangedListener.
-     */
-    public void setColor(int color, boolean callback) {
-
-        int alpha = Color.alpha(color);
-        int red = Color.red(color);
-        int blue = Color.blue(color);
-        int green = Color.green(color);
-
-        float[] hsv = new float[3];
-
-        Color.RGBToHSV(red, green, blue, hsv);
-
-        mAlpha = alpha;
-        mHue = hsv[0];
-        mSat = hsv[1];
-        mVal = hsv[2];
-
-        if (callback && mListener != null) {
-            mListener.onColorChanged(Color.HSVToColor(mAlpha, new float[]{mHue, mSat, mVal}));
-        }
-
-        invalidate();
-    }
-
-    /**
-     * Get the drawing offset of the color picker view.
-     * The drawing offset is the distance from the side of
-     * a panel to the side of the view minus the padding.
-     * Useful if you want to have your own panel below showing
-     * the currently selected color and want to align it perfectly.
-     * @return The offset in pixels.
-     */
-    public float getDrawingOffset() {
-        return mDrawingOffset;
-    }
-
-    /**
-     * Set if the user is allowed to adjust the alpha panel. Default is false.
-     * If it is set to false no alpha will be set.
-     * @param visible
-     */
-    public void setAlphaSliderVisible(boolean visible) {
-
-        if (mShowAlphaPanel != visible) {
-            mShowAlphaPanel = visible;
-
-            /*
-             * Reset all shader to force a recreation.
-             * Otherwise they will not look right after
-             * the size of the view has changed.
-             */
-            mValShader = null;
-            mSatShader = null;
-            mHueShader = null;
-            mAlphaShader = null;;
-
-            requestLayout();
-        }
-
-    }
-
-    public void setSliderTrackerColor(int color) {
-        mSliderTrackerColor = color;
-
-        mHueTrackerPaint.setColor(mSliderTrackerColor);
-
-        invalidate();
-    }
-
-    public int getSliderTrackerColor() {
-        return mSliderTrackerColor;
-    }
-
-    /**
-     * Set the text that should be shown in the
-     * alpha slider. Set to null to disable text.
-     * @param res string resource id.
-     */
-    public void setAlphaSliderText(int res) {
-        String text = getContext().getString(res);
-        setAlphaSliderText(text);
-    }
-
-    /**
-     * Set the text that should be shown in the
-     * alpha slider. Set to null to disable text.
-     * @param text Text that should be shown.
-     */
-    public void setAlphaSliderText(String text) {
-        mAlphaSliderText = text;
-        invalidate();
-    }
-
-    /**
-     * Get the current value of the text
-     * that will be shown in the alpha
-     * slider.
-     * @return
-     */
-    public String getAlphaSliderText() {
-        return mAlphaSliderText;
-    }
-
-    /**
-     * Method that checks the support for HardwareAcceleration. Check AOSP notice<br/>
-     * <br/>
-     * <pre>
-     * 'ComposeShader can only contain shaders of different types (a BitmapShader and a
-     * LinearGradient for instance, but not two instances of BitmapShader)'. But, 'If your
-     * application is affected by any of these missing features or limitations, you can turn
-     * off hardware acceleration for just the affected portion of your application by calling
-     * setLayerType(View.LAYER_TYPE_SOFTWARE, null).'
-     */
-    private void checkHardwareAccelerationSupport() {
-       // HardwareAcceleration sit is only available since ICS. 14 = ICS_VERSION_CODE
-       if (android.os.Build.VERSION.SDK_INT >= 14) {
-           try{
-               // We need to use reflection to get that method to avoid compilation errors
-               Method isHardwareAccelerated =
-                       getClass().getMethod("isHardwareAccelerated", new Class[]{});
-               Object o = isHardwareAccelerated.invoke(this, new Object[]{});
-               if (null != o && o instanceof Boolean && (Boolean)o) {
-                   // HardwareAcceleration is supported. Use SoftwareAcceleration
-                   Method setLayerType =
-                           getClass().getMethod(
-                                   "setLayerType", int.class, android.graphics.Paint.class);
-                   setLayerType.invoke(this, 1, (android.graphics.Paint)null);
-               }
-           } catch (Exception e) { /** NON BLOCK **/}
-       }
-   }
-
-}
diff --git a/res/layout/choose_disposition_fragment.xml b/res/layout/choose_disposition_fragment.xml
index a72f148..c42ae7d 100644
--- a/res/layout/choose_disposition_fragment.xml
+++ b/res/layout/choose_disposition_fragment.xml
@@ -27,28 +27,29 @@
         android:layout_marginLeft="@dimen/disposition_frame_margin"
         android:layout_marginRight="@dimen/disposition_frame_margin"
         android:padding="@dimen/disposition_advise_frame_padding"
-        android:gravity="center_horizontal"
+        android:gravity="center"
+        android:lines="@integer/disposition_advise_lines"
         android:textColor="@color/notification_text_color"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/pref_disposition_description" />
 
-    <org.cyanogenmod.wallpapers.photophase.widgets.DispositionView
-        android:id="@+id/disposition_view"
+    <android.support.v4.view.ViewPager
+        android:id="@+id/dispositions_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/disposition_frame_margin"
         android:layout_below="@id/advise"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true" />
+        android:layout_alignParentBottom="true">
+    </android.support.v4.view.ViewPager>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignLeft="@id/disposition_view"
-        android:layout_alignRight="@id/disposition_view"
-        android:layout_alignTop="@id/disposition_view"
-        android:layout_alignBottom="@id/disposition_view">
+        android:layout_alignLeft="@id/dispositions_pager"
+        android:layout_alignRight="@id/dispositions_pager"
+        android:layout_alignTop="@id/dispositions_pager"
+        android:layout_alignBottom="@id/dispositions_pager">
         <org.cyanogenmod.wallpapers.photophase.widgets.ResizeFrame
             android:id="@+id/resize_frame"
             android:layout_width="1dp"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 41d1358..9a5b2eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -75,7 +75,8 @@
     <string name="pref_disposition_portrait_summary">Selecciona como se mostraran las imágenes en una pantalla horizontal</string>
     <string name="pref_disposition_landscape">Disposición horizontal</string>
     <string name="pref_disposition_landscape_summary">Selecciona como se mostraran las imágenes en una pantalla vertical</string>
-    <string name="pref_disposition_description">Presiona una celda durante un segundo para seleccionarla. Entonces arrastra y suelta los bordes de la celda para redimensionarla</string>
+    <string name="pref_disposition_description">Presiona una celda y arrastre sus bordes. Deslize a izquierda y derecha para ver plantillas predefinidas</string>
+    <string name="pref_disposition_template">Plantilla <xliff:g id="number_of_template">%1$s</xliff:g> de <xliff:g id="total_of_templates">%2$s</xliff:g></string>
     <string name="pref_disposition_unable_delete_advise">No es posible borrar la celda seleccionada</string>
     <string name="pref_about">Acerca de</string>
     <string name="pref_about_summary">PhotoPhase v<xliff:g id="version">%1$s</xliff:g>\nCopyright \u00A9 2013 The CyanogenMod Project</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9f80bce..d53ecd3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,5 +25,6 @@
     <color name="notification_text_color">#ffffffff</color>
 
     <color name="disposition_frame_bg_color">#c8595757</color>
+    <color name="disposition_locked_frame_bg_color">#c87f4a4a</color>
 
 </resources>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 64f948c..25e3088 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -21,4 +21,5 @@
     <integer name="pictures_anim_out">400</integer>
     <integer name="disposition_show_anim">600</integer>
     <integer name="disposition_hide_anim">400</integer>
+    <integer name="disposition_advise_lines">2</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0359ae..a99e7a1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -91,7 +91,9 @@
     <string name="pref_disposition_portrait_summary">Select how pictures are disposed on a portrait screen</string>
     <string name="pref_disposition_landscape">Landscape disposition</string>
     <string name="pref_disposition_landscape_summary">Select how pictures are disposed on a landscape screen</string>
-    <string name="pref_disposition_description">Long tap a frame to select it. Then drag \u0026 drop the borders of the frame to resize it</string>
+    <!-- [2 lines one for describe long tap and another for describe swipe] -->
+    <string name="pref_disposition_description">Long tap a frame and drag \u0026 drop its borders.\nSwipe left and right to show defined templates</string>
+    <string name="pref_disposition_template">Template <xliff:g id="number_of_template">%1$s</xliff:g> of <xliff:g id="total_of_templates">%2$s</xliff:g></string>
     <string name="pref_disposition_unable_delete_advise">Unable to delete the selected frame</string>
 
     <string name="pref_about">About</string>