diff options
| author | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-04 20:32:45 -0600 |
|---|---|---|
| committer | Aidan Follestad <drummer.aidan@gmail.com> | 2016-01-04 20:32:45 -0600 |
| commit | 47b115f344ba5c105fd984b3297527d4142203ce (patch) | |
| tree | f203abbb34bb88cc43fa679573148faa64303dee | |
| parent | 58f3c5f6bd5069ab76aff5d52565c0abb263ecbe (diff) | |
| parent | e05228b4896ab80ef58300b7ef75ba93aadbf918 (diff) | |
| download | afollestad-47b115f344ba5c105fd984b3297527d4142203ce.tar.gz | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | commons/src/main/res/layout/md_stub_colorchooser_custom.xml | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -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 index eacd7fc..f53302c 100644 --- 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>
\ No newline at end of file +</LinearLayout> |