ColorPicker: Fix preference preview drawable and alpha slider by default

Signed-off-by: mydongistiny <[email protected]>

Author: XXMrHyde

src/net/margaritov/preference/colorpicker/ColorPickerPreference.java

@@ -55,7 +55,6 @@ public class ColorPickerPreference extends Preference implements
     private static final String sAndroidns = "http://schemas.android.com/apk/res/android";
 
     private PreferenceViewHolder mViewHolder;
-    private View mPreview;
 
     private ColorPickerFragment mPickerFragment;
 
@@ -66,7 +65,7 @@ public class ColorPickerPreference extends Preference implements
     private String mResetColor1Title = null;
     private String mResetColor2Title = null;
     private int mValue;
-    private boolean mAlphaSliderVisible = false;
+    private boolean mAlphaSliderVisible = true;
 
     public ColorPickerPreference(Context context) {
         this(context, null);
@@ -150,6 +149,7 @@ private void setPreview() {
             return;
         }
 
+        widgetFrameView.removeAllViews();
         float density = mResources.getDisplayMetrics().density;
         final int size = (int) mResources.getDimension(
                 R.dimen.color_picker_preference_preview_width_height);
@@ -163,18 +163,18 @@ private void setPreview() {
             borderColor = mResources.getColor(tv.resourceId);
         }
 
-        mPreview = new View(getContext());
+        View preview = new View(getContext());
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(size, size);
         ColorViewCircleDrawable drawable = new ColorViewCircleDrawable(getContext(), size);
 
         widgetFrameView.setVisibility(View.VISIBLE);
         widgetFrameView.setPadding(widgetFrameView.getPaddingLeft(), widgetFrameView.getPaddingTop(),
                 (int) (density * 8), widgetFrameView.getPaddingBottom());
-        mPreview.setLayoutParams(lp);
-        drawable.setColor(getValue());
+        preview.setLayoutParams(lp);
+        drawable.setColor(mValue);
         drawable.setBorderColor(borderColor);
-        mPreview.setBackground(drawable);
-        widgetFrameView.addView(mPreview);
+        preview.setBackground(drawable);
+        widgetFrameView.addView(preview);
         widgetFrameView.setMinimumWidth(0);
     }
 
@@ -196,13 +196,11 @@ public void onColorChanged(int color) {
             persistInt(color);
         }
         mValue = color;
-        if (mPreview != null) {
-            ((ColorViewCircleDrawable) mPreview.getBackground()).setColor(color);
-        }
         try {
             getOnPreferenceChangeListener().onPreferenceChange(this, color);
         } catch (NullPointerException e) {
         }
+        setPreview();
     }
 
     @Override
@@ -254,11 +252,11 @@ private void showFragment(Bundle state) {
             boolean showHelpScreen = prefs.getBoolean("show_help_screen", true);
             arguments = new Bundle();
 
-            arguments.putInt("new_color", getValue());
-            arguments.putInt("old_color", getValue());
+            arguments.putInt("new_color", mValue);
+            arguments.putInt("old_color", mValue);
             arguments.putBoolean("help_screen_visible", showHelpScreen);
         }
-        arguments.putInt("initial_color", getValue());
+        arguments.putInt("initial_color", mValue);
         arguments.putInt("reset_color_1", mResetColor1);
         arguments.putInt("reset_color_2", mResetColor2);
         arguments.putCharSequence("reset_color_1_title", mResetColor1Title);