21 files changed, 5 insertions, 30 deletions

diff --git a/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
index e553ed10..5c05e4ec 100644
--- a/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
@@ -14,8 +14,6 @@ import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import eu.siacs.conversations.R;
-
 public class AmbilWarnaDialog {
 	public interface OnAmbilWarnaListener {
 		void onCancel(AmbilWarnaDialog dialog);
@@ -297,4 +295,4 @@ public class AmbilWarnaDialog {
 		});
 		viewAlphaOverlay.setBackgroundDrawable(gd);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
index 9fb854df..1f0c86e4 100644
--- a/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
@@ -43,4 +43,4 @@ public class AmbilWarnaSquare extends View {
 		color[0] = hue;
 		invalidate();
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
index 6da10bb0..7ed4c4e3 100644
--- a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
@@ -31,4 +31,4 @@ public class AmbilWarnaPrefWidgetView extends View {
 
 		canvas.drawRect(strokeWidth, strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, paint);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
index f18ed00c..2c634eb9 100644
--- a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
@@ -8,8 +8,8 @@ import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import eu.siacs.conversations.R;
 import yuku.ambilwarna.AmbilWarnaDialog;
+import yuku.ambilwarna.R;
 
 public class AmbilWarnaPreference extends Preference {
 	private final boolean supportsAlpha;
@@ -131,4 +131,4 @@ public class AmbilWarnaPreference extends Preference {
 			}
 		};
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png
index d2aa1b09..d2aa1b09 100644
--- a/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png
diff --git a/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png
index faf1bd75..faf1bd75 100644
--- a/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png
diff --git a/src/main/res/drawable-hdpi/ambilwarna_cursor.png b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_cursor.png
index 28cebc32..28cebc32 100644
--- a/src/main/res/drawable-hdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_cursor.png
diff --git a/src/main/res/drawable-hdpi/ambilwarna_target.png b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_target.png
index 6f7bf906..6f7bf906 100644
--- a/src/main/res/drawable-hdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_target.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png
index 5ceec214..5ceec214 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png
index 5f434552..5f434552 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png
index 23d54619..23d54619 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_cursor.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_cursor.png
index c336e883..c336e883 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_cursor.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_hue.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_hue.png
index 09d28397..09d28397 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_hue.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_hue.png
diff --git a/src/main/res/drawable-mdpi/ambilwarna_target.png b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_target.png
index 56fa0de9..56fa0de9 100644
--- a/src/main/res/drawable-mdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_target.png
diff --git a/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png
index 592dd7ca..592dd7ca 100644
--- a/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png
diff --git a/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png
index 04f655ad..04f655ad 100644
--- a/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png
diff --git a/src/main/res/drawable-xhdpi/ambilwarna_cursor.png b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_cursor.png
index ddea3167..ddea3167 100644
--- a/src/main/res/drawable-xhdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_cursor.png
diff --git a/src/main/res/drawable-xhdpi/ambilwarna_target.png b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_target.png
index bb4b1eb7..bb4b1eb7 100644
--- a/src/main/res/drawable-xhdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_target.png
diff --git a/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml b/libs/colorpicker/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml
index 049f1332..049f1332 100644
--- a/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml
+++ b/libs/colorpicker/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml
diff --git a/src/main/res/layout/ambilwarna_dialog.xml b/libs/colorpicker/src/main/res/layout/ambilwarna_dialog.xml
index 8a1a403e..8a1a403e 100644
--- a/src/main/res/layout/ambilwarna_dialog.xml
+++ b/libs/colorpicker/src/main/res/layout/ambilwarna_dialog.xml
diff --git a/src/main/res/layout/ambilwarna_pref_widget.xml b/src/main/res/layout/ambilwarna_pref_widget.xml
deleted file mode 100644
index 2fd69a36..00000000
--- a/src/main/res/layout/ambilwarna_pref_widget.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_gravity="center_vertical"
-    android:layout_marginRight="6dp"
-    android:focusable="false"
-    android:clickable="false">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:src="@drawable/ambilwarna_alphacheckered_tiled"/>
-
-
-    <yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/ambilwarna_pref_widget_box"
-        />
-</FrameLayout>
\ No newline at end of file