Browse Source

Merge remote-tracking branch 'origin/master'

Aidan Follestad 8 years ago
parent
commit
d0d99914db

+ 14 - 0
commons/src/main/java/com/afollestad/materialdialogs/color/ColorChooserDialog.java

@@ -156,6 +156,12 @@ public class ColorChooserDialog extends DialogFragment implements View.OnClickLi
         return title;
     }
 
+    public String tag() {
+        Builder builder = getBuilder();
+        if (builder.mTag!=null) return builder.mTag;
+        else return super.getTag();
+    }
+
     public boolean isAccentMode() {
         return getBuilder().mAccentMode;
     }
@@ -572,6 +578,8 @@ public class ColorChooserDialog extends DialogFragment implements View.OnClickLi
         @Nullable
         protected int[][] mColorsSub;
 
+        protected String mTag;
+
         protected boolean mAccentMode = false;
         protected boolean mDynamicButtonColor = true;
         protected boolean mAllowUserCustom = true;
@@ -589,6 +597,12 @@ public class ColorChooserDialog extends DialogFragment implements View.OnClickLi
             return this;
         }
 
+        @NonNull
+        public Builder tag(String tag) {
+            mTag=tag;
+            return this;
+        }
+
         @NonNull
         public Builder preselect(@ColorInt int preselect) {
             mPreselect = preselect;