psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Color Picker: Remove OnClick listener to fix disabling

Browse Source
This commit is contained in:
xyyx
2018-09-20 15:13:56 +08:00
committed by hungphan2001
parent 369891b075
commit dc303b2607
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/margaritov/preference/colorpicker/ColorPickerPreference.java
View File

@@ -53,7 +53,6 @@ public class ColorPickerPreference extends Preference implements
private int mValue = Color.BLACK; private int mValue = Color.BLACK;
private float mDensity = 0; private float mDensity = 0;
private boolean mAlphaSliderEnabled = false; private boolean mAlphaSliderEnabled = false;
private boolean mEnabled = true;
// if we return -6, button is not enabled // if we return -6, button is not enabled
static final String SETTINGS_NS = "http://schemas.android.com/apk/res/com.android.settings"; static final String SETTINGS_NS = "http://schemas.android.com/apk/res/com.android.settings";
@@ -210,22 +209,6 @@ public class ColorPickerPreference extends Preference implements
(mValue - 0x101010) : mValue; (mValue - 0x101010) : mValue;
iView.setImageDrawable(createOvalShape(size, 0xFF000000 + imageColor)); iView.setImageDrawable(createOvalShape(size, 0xFF000000 + imageColor));
iView.setTag("preview"); iView.setTag("preview");
iView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mEnabled) {
showDialog(null);
}
}
});
}
@Override
public void setEnabled(boolean enabled) {
super.setEnabled(enabled);
if (mEnabled != enabled) {
mEnabled = enabled;
}
} }
@Override @Override