Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_activities.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_emoticons.webp
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_flags.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_food_drink.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_objects.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_people_body.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_recents.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_emoji_symbols.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_activities.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_emoticons.webp
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_flags.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_food_drink.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_objects.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_people_body.png
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_recents.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_emoji_symbols.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file removed app/src/main/res/drawable-xhdpi/ic_emoji_emoticons.webp
Diff not rendered.
Binary file removed app/src/main/res/drawable-xhdpi/ic_emoji_flags.png
Diff not rendered.
Diff not rendered.
Binary file removed app/src/main/res/drawable-xhdpi/ic_emoji_objects.png
Diff not rendered.
Diff not rendered.
Binary file removed app/src/main/res/drawable-xhdpi/ic_emoji_recents.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed app/src/main/res/drawable-xxhdpi/ic_emoji_flags.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_activities.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--clipart available in Android Studio, Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M18 2C17.1 2 16 3 16 4H8C8 3 6.9 2 6 2H2V11C2 12 3 13 4 13H6.2C6.6 15 7.9 16.7 11 17V19.08C8 19.54 8 22 8 22H16C16 22 16 19.54 13 19.08V17C16.1 16.7 17.4 15 17.8 13H20C21 13 22 12 22 11V2H18M6 11H4V4H6V11M20 11H18V4H20V11Z"/>
</vector>
16 changes: 8 additions & 8 deletions app/src/main/res/drawable/ic_emoji_activities_lxx.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- when using inset drawable, insets are only respected in preview -->
<!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
<item
android:width="24dp"
android:height="24dp"
android:drawable="@drawable/ic_emoji_activities"
/>
</layer-list>
<!-- when using inset drawable, insets are only respected in preview -->
<!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
<item
android:width="24dp"
android:height="24dp"
android:drawable="@drawable/ic_emoji_activities"
/>
</layer-list>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ic_emoji_animals_nature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!--clipart available in Android Studio, Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M13.49,10.51c-0.43,-0.43 -0.94,-0.73 -1.49,-0.93V8h-1v1.38c-0.11,-0.01 -0.23,-0.03 -0.34,-0.03c-1.02,0 -2.05,0.39 -2.83,1.17c-0.16,0.16 -0.3,0.34 -0.43,0.53L6,10.52c-1.56,-0.55 -3.28,0.27 -3.83,1.82c0,0 0,0 0,0c-0.27,0.75 -0.23,1.57 0.12,2.29c0.23,0.48 0.58,0.87 1,1.16c-0.38,1.35 -0.06,2.85 1,3.91c1.06,1.06 2.57,1.38 3.91,1c0.29,0.42 0.68,0.77 1.16,1C9.78,21.9 10.21,22 10.65,22c0.34,0 0.68,-0.06 1.01,-0.17c0,0 0,0 0,0c1.56,-0.55 2.38,-2.27 1.82,-3.85l-0.52,-1.37c0.18,-0.13 0.36,-0.27 0.53,-0.43c0.87,-0.87 1.24,-2.04 1.14,-3.17H16v-1h-1.59C14.22,11.46 13.92,10.95 13.49,10.51zM4.67,14.29c-0.25,-0.09 -0.45,-0.27 -0.57,-0.51s-0.13,-0.51 -0.04,-0.76c0.19,-0.52 0.76,-0.79 1.26,-0.61l3.16,1.19C7.33,14.2 5.85,14.71 4.67,14.29zM10.99,19.94c-0.25,0.09 -0.52,0.08 -0.76,-0.04c-0.24,-0.11 -0.42,-0.32 -0.51,-0.57c-0.42,-1.18 0.09,-2.65 0.7,-3.8l1.18,3.13C11.78,19.18 11.51,19.76 10.99,19.94zM12.2,14.6l-0.61,-1.61c0,-0.01 -0.01,-0.02 -0.02,-0.03c-0.02,-0.04 -0.04,-0.08 -0.06,-0.12c-0.02,-0.04 -0.04,-0.07 -0.07,-0.11c-0.03,-0.03 -0.06,-0.06 -0.09,-0.09c-0.03,-0.03 -0.06,-0.06 -0.09,-0.09c-0.03,-0.03 -0.07,-0.05 -0.11,-0.07c-0.04,-0.02 -0.07,-0.05 -0.12,-0.06c-0.01,0 -0.02,-0.01 -0.03,-0.02L9.4,11.8c0.36,-0.29 0.79,-0.46 1.26,-0.46c0.53,0 1.04,0.21 1.41,0.59C12.8,12.66 12.84,13.81 12.2,14.6z"/>
<path
android:fillColor="#FFF"
android:pathData="M21.94,4.88C21.76,4.35 21.25,4 20.68,4c-0.03,0 -0.06,0 -0.09,0H19.6l-0.31,-0.97C19.15,2.43 18.61,2 18,2h0c-0.61,0 -1.15,0.43 -1.29,1.04L16.4,4h-0.98c-0.03,0 -0.06,0 -0.09,0c-0.57,0 -1.08,0.35 -1.26,0.88c-0.19,0.56 0.04,1.17 0.56,1.48l0.87,0.52L15.1,8.12c-0.23,0.58 -0.04,1.25 0.45,1.62C15.78,9.91 16.06,10 16.33,10c0.31,0 0.61,-0.11 0.86,-0.32L18,8.98l0.81,0.7C19.06,9.89 19.36,10 19.67,10c0.27,0 0.55,-0.09 0.78,-0.26c0.5,-0.37 0.68,-1.04 0.45,-1.62l-0.39,-1.24l0.87,-0.52C21.89,6.05 22.12,5.44 21.94,4.88zM18,7c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C19,6.55 18.55,7 18,7z"/>
</vector>
20 changes: 20 additions & 0 deletions app/src/main/res/drawable/ic_emoji_emoticons.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportHeight="96"
android:viewportWidth="96">
<path
android:fillColor="#FFF"
android:pathData="M58.5,20c-0.4,1.3 0.2,3.1 1.9,5.3 8.7,11.4 8.3,36.6 -0.6,46.4 -2.2,2.3 -1.7,6.3 0.7,6.3 2.4,-0 8.6,-7.1 11.4,-12.9 2.3,-5 2.6,-6.8 2.6,-17.1 0,-10.6 -0.2,-12 -2.8,-17.2 -2.5,-5.2 -9.5,-12.8 -11.6,-12.8 -0.5,-0 -1.2,0.9 -1.6,2z"/>
<path
android:fillColor="#FFF"
android:pathData="M20,37.5c0,3.5 0,3.5 4.5,3.5 4.5,-0 4.5,-0 4.5,-3.5 0,-3.5 0,-3.5 -4.5,-3.5 -4.5,-0 -4.5,-0 -4.5,3.5z"/>
<path
android:fillColor="#FFF"
android:pathData="M36,46.5l0,3.5 8.5,-0 8.5,-0 0,-3.5 0,-3.5 -8.5,-0 -8.5,-0 0,3.5z"/>
<path
android:fillColor="#FFF"
android:pathData="M20,61.5c0,3.5 0,3.5 4.5,3.5 4.5,-0 4.5,-0 4.5,-3.5 0,-3.5 0,-3.5 -4.5,-3.5 -4.5,-0 -4.5,-0 -4.5,3.5z"/>
</vector>
3 changes: 2 additions & 1 deletion app/src/main/res/drawable/ic_emoji_emoticons_lxx.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- when using inset drawable, insets are only respected in preview -->
<!-- when setting width/height for the whole drawable (and not just a layer), it's ignored too -->
Expand All @@ -7,4 +8,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_emoticons"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_flags.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M6,3A1,1 0 0,1 7,4V4.88C8.06,4.44 9.5,4 11,4C14,4 14,6 16,6C19,6 20,4 20,4V12C20,12 19,14 16,14C13,14 13,12 11,12C8,12 7,14 7,14V21H5V4A1,1 0 0,1 6,3Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_flags_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_flags"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_food_drink.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--clipart available in Android Studio, Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M4,19H20V21H4V19M20,8V5H18V8H20M20,3C20.6,3 21,3.2 21.4,3.6C21.8,4 22,4.5 22,5V8C22,8.6 21.8,9 21.4,9.4C21,9.8 20.6,10 20,10H18V13C18,14.1 17.6,15 16.8,15.8C16,16.6 15.1,17 14,17H8C6.9,17 6,16.6 5.2,15.8C4.4,15 4,14.1 4,13V3H9V5.4L7.2,6.8C7.1,6.9 7,7.1 7,7.2V11.5C7,11.8 7.2,12 7.5,12H11.5C11.8,12 12,11.8 12,11.5V7.2C12,7 11.9,6.9 11.8,6.8L10,5.4V3H20Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_food_drink_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_food_drink"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_objects.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--clipart available in Android Studio, Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M12,2A7,7 0 0,0 5,9C5,11.38 6.19,13.47 8,14.74V17A1,1 0 0,0 9,18H15A1,1 0 0,0 16,17V14.74C17.81,13.47 19,11.38 19,9A7,7 0 0,0 12,2M9,21A1,1 0 0,0 10,22H14A1,1 0 0,0 15,21V20H9V21Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_objects_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_objects"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_people_body.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M5,1C5,3.7 6.56,6.16 9,7.32V22H11V15H13V22H15V7.31C17.44,6.16 19,3.7 19,1H17A5,5 0 0,1 12,6A5,5 0 0,1 7,1M12,1C10.89,1 10,1.89 10,3C10,4.11 10.89,5 12,5C13.11,5 14,4.11 14,3C14,1.89 13.11,1 12,1Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_people_body_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_people_body"
/>
</layer-list>
</layer-list>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ic_emoji_recents.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="28dp"
android:width="28dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#FFF"
android:pathData="M12.203,3.871l-1.274,0l-0.438,8.199l0.113,0.858l6.132,5.456l0.969,-0.994l-5.072,-5.435z"/>
<path
android:fillColor="#FFF"
android:pathData="M12,0C5.373,0 0,5.373 0,12c0,6.627 5.373,12 12,12s12,-5.373 12,-12C24,5.373 18.627,0 12,0zM12,22C6.477,22 2,17.523 2,12C2,6.477 6.477,2 12,2s10,4.477 10,10C22,17.523 17.523,22 12,22z"/>
</vector>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_recents_lxx.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--clipart available in Android Studio, Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#FFF"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM15.29,16.71L11,12.41V7h2v4.59l3.71,3.71L15.29,16.71z"/>
</vector>
10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_emoji_recents_lxx_wrap.xml

This file was deleted.

11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_smileys_emotion.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M15.5,8A1.5,1.5 0 0,1 17,9.5A1.5,1.5 0 0,1 15.5,11A1.5,1.5 0 0,1 14,9.5A1.5,1.5 0 0,1 15.5,8M8.5,8A1.5,1.5 0 0,1 10,9.5A1.5,1.5 0 0,1 8.5,11A1.5,1.5 0 0,1 7,9.5A1.5,1.5 0 0,1 8.5,8M12,17.5C9.67,17.5 7.69,16.04 6.89,14H17.11C16.3,16.04 14.33,17.5 12,17.5Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_smileys_emotion_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_smileys_emotion"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_symbols.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M2 7V14H4V7H2M6 7V9H10V11H8V14H10V13C11.11 13 12 12.11 12 11V9C12 7.89 11.11 7 10 7H6M15.8 7L15.6 9H14V11H15.4L15.2 13H14V15H15L14.8 17H16.8L17 15H18.4L18.2 17H20.2L20.4 15H22V13H20.6L20.8 11H22V9H21L21.2 7H19.2L19 9H17.6L17.8 7H15.8M17.4 11H18.8L18.6 13H17.2L17.4 11M2 15V17H4V15H2M8 15V17H10V15H8Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_symbols_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_symbols"
/>
</layer-list>
</layer-list>
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_emoji_travel_places.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Apache License 2.0-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="32dp"
android:width="32dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFF"
android:pathData="M5,11L6.5,6.5H17.5L19,11M17.5,16A1.5,1.5 0 0,1 16,14.5A1.5,1.5 0 0,1 17.5,13A1.5,1.5 0 0,1 19,14.5A1.5,1.5 0 0,1 17.5,16M6.5,16A1.5,1.5 0 0,1 5,14.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 8,14.5A1.5,1.5 0 0,1 6.5,16M18.92,6C18.72,5.42 18.16,5 17.5,5H6.5C5.84,5 5.28,5.42 5.08,6L3,12V20A1,1 0 0,0 4,21H5A1,1 0 0,0 6,20V19H18V20A1,1 0 0,0 19,21H20A1,1 0 0,0 21,20V12L18.92,6Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_emoji_travel_places_lxx.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
android:height="24dp"
android:drawable="@drawable/ic_emoji_travel_places"
/>
</layer-list>
</layer-list>
2 changes: 1 addition & 1 deletion app/src/main/res/values/themes-lxx-base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<item name="categoryIndicatorEnabled">false</item>
<item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item>
<item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base</item>
<item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_wrap</item>
<item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx</item>
<item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_lxx</item>
<item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_lxx</item>
<item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_lxx</item>
Expand Down