Merge remote-tracking branch 'origin/master'

afollestad · afollestad · commit 47b115f344ba · 2016-01-04T20:32:45.000-06:00
diff --git a/README.md b/README.md
@@ -858,7 +858,7 @@ you show from an Activity which has a theme containing any of these attributes:
         The name of font in assets/fonts used everywhere else, like content and list items
         (null uses device default). E.g. [your-project]/app/main/assets/fonts/[regular]
     -->
-    <item name="md_regular_font">Roboto-Medium.ttf</item>
+    <item name="md_regular_font">Roboto-Regular.ttf</item>
 
 </style>
 ```
@@ -1226,7 +1226,7 @@ new FileChooserDialog.Builder(this)
 The Activity you show the dialog in must implement `FileCallback`:
 
 ```java
-public class MyActivity implements FolderChooserDialog.FileCallback {
+public class MyActivity implements FileChooserDialog.FileCallback {
 
     // ...
 
diff --git a/commons/src/main/res/layout/md_stub_colorchooser_custom.xml b/commons/src/main/res/layout/md_stub_colorchooser_custom.xml
@@ -26,6 +26,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="2dp"
             android:layout_marginRight="2dp"
+            android:digits="0123456789abcdefABCDEF"
             android:text="#"
             android:textColor="?android:textColorPrimary"
             android:textColorHint="?android:textColorSecondary"
@@ -226,4 +227,4 @@
 
     </RelativeLayout>
 
-</LinearLayout>
+</LinearLayout>
