xander/main
1
0
Fork 0
mirror of https://github.com/googlefonts/noto-emoji.git synced 2025-07-08 21:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add more licensing information, update CHANGES.md

Browse source
This commit is contained in:
Constantin A 2018-04-08 13:55:31 +02:00
parent 83e57c1707
commit c6912e125b
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGES.md
View file

@ -1,9 +1,10 @@
Changes from Google Noto Color Emoji v x.x Changes from Google Noto Color Emoji v2017-05-18 (approx.)
======= =======
These are the files which are/were not included in the original Noto Emoji. These are the SVG/PNG files which are/were not included in the original Noto Emoji (or have been modified).
Due to the fact that I didn't worked with git in mind, ALL emojis have been Due to the fact that I didn't worked with git in mind, ALL emojis have been reuploaded although not every file has been modified.
reuploaded. Any other modifications that have been made can be seen in the Git history as these modifications have been made _after_ uploading
this repository to Github.
There are currently four types of changes: There are currently four types of changes:

22
emojicompat/AssetEmojiCompatConfig.java
View file

@ -1,6 +1,25 @@
/*
* Original file (https://android.googlesource.com/platform/frameworks/support/+/master/emoji/bundled/src/main/java/android/support/text/emoji/bundled/BundledEmojiCompatConfig.java):
* Copyright (C) 2017 The Android Open Source Project
* Modifications Copyright (C) 2018 Constantin A.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import android.content.Context;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.text.emoji.EmojiCompat; import android.support.text.emoji.EmojiCompat;
import android.support.text.emoji.MetadataRepo; import android.support.text.emoji.MetadataRepo;
import android.util.Log; import android.util.Log;
@ -13,6 +32,7 @@ import android.support.v4.util.Preconditions;
* Changes are marked with comments. Formatting and other simple changes are not always marked. * Changes are marked with comments. Formatting and other simple changes are not always marked.
*/ */
public class AssetEmojiCompatConfig extends EmojiCompat.Config { public class AssetEmojiCompatConfig extends EmojiCompat.Config {
// The class name is obviously changed from the original file
/** /**
* Create a new configuration for this EmojiCompat * Create a new configuration for this EmojiCompat
@ -78,7 +98,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
public void run() { public void run() {
try { try {
final AssetManager assetManager = context.getAssets(); final AssetManager assetManager = context.getAssets();
final MetadataRepo resourceIndex = MetadataRepo.create(mgr, FONT_NAME); final MetadataRepo resourceIndex = MetadataRepo.create(assetManager, FONT_NAME);
loaderCallback.onLoaded(resourceIndex); loaderCallback.onLoaded(resourceIndex);
} catch (Throwable t) { } catch (Throwable t) {
loaderCallback.onFailed(t); loaderCallback.onFailed(t);