diff options
| author | Maxime Biais <maxime.biais@gmail.com> | 2016-10-03 15:41:44 +0200 |
|---|---|---|
| committer | Maxime Biais <maxime.biais@gmail.com> | 2016-10-03 15:41:44 +0200 |
| commit | 5a83efba0169d97d554fd38ee40670d3771ba322 (patch) | |
| tree | 15864a1187012dbef5e45f1b78dfb28d9d316c89 | |
| parent | 7ef8f4915e84c8f58f3f192db09156b58c4b77a0 (diff) | |
| parent | 717aa20bc35f93814ceba9f4aba9affd43808c1a (diff) | |
| download | gradle-perf-android-medium-5a83efba0169d97d554fd38ee40670d3771ba322.tar.gz | |
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into develop
| -rw-r--r-- | WordPress/src/main/assets/fonts/Noticons-Regular.otf | bin | 17780 -> 0 bytes | |||
| -rw-r--r-- | WordPress/src/main/assets/fonts/Noticons.ttf | bin | 0 -> 29604 bytes | |||
| -rw-r--r-- | WordPress/src/main/java/org/wordpress/android/widgets/NoticonTextView.java | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/WordPress/src/main/assets/fonts/Noticons-Regular.otf b/WordPress/src/main/assets/fonts/Noticons-Regular.otf Binary files differdeleted file mode 100644 index 842fce6e6..000000000 --- a/WordPress/src/main/assets/fonts/Noticons-Regular.otf +++ /dev/null diff --git a/WordPress/src/main/assets/fonts/Noticons.ttf b/WordPress/src/main/assets/fonts/Noticons.ttf Binary files differnew file mode 100644 index 000000000..7cbcabe84 --- /dev/null +++ b/WordPress/src/main/assets/fonts/Noticons.ttf 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 eb2959aae..f6255692c 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 @@ import android.widget.TextView; * 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); |