| commit | 5a83efba0169d97d554fd38ee40670d3771ba322 | [log] [tgz] |
|---|---|---|
| author | Maxime Biais <maxime.biais@gmail.com> | Mon Oct 03 15:41:44 2016 +0200 |
| committer | Maxime Biais <maxime.biais@gmail.com> | Mon Oct 03 15:41:44 2016 +0200 |
| tree | 15864a1187012dbef5e45f1b78dfb28d9d316c89 | |
| parent | 7ef8f4915e84c8f58f3f192db09156b58c4b77a0 [diff] | |
| parent | 717aa20bc35f93814ceba9f4aba9affd43808c1a [diff] |
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into develop
diff --git a/WordPress/src/main/assets/fonts/Noticons-Regular.otf b/WordPress/src/main/assets/fonts/Noticons-Regular.otf deleted file mode 100644 index 842fce6..0000000 --- a/WordPress/src/main/assets/fonts/Noticons-Regular.otf +++ /dev/null Binary files differ
diff --git a/WordPress/src/main/assets/fonts/Noticons.ttf b/WordPress/src/main/assets/fonts/Noticons.ttf new file mode 100644 index 0000000..7cbcabe --- /dev/null +++ b/WordPress/src/main/assets/fonts/Noticons.ttf Binary files differ
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java b/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java index eb2959a..f625569 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java
@@ -8,7 +8,7 @@ * TextView that uses noticon icon font */ public class NoticonTextView extends TextView { - private static final String NOTICON_FONT_NAME = "Noticons-Regular.otf"; + private static final String NOTICON_FONT_NAME = "Noticons.ttf"; public NoticonTextView(Context context) { super(context, null);