diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be8b6be0f0..465b48d58f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -182,6 +182,21 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:exported="true" />
+
+
+
+
+
+
+
+
+
@@ -319,9 +334,15 @@
android:windowSoftInputMode="stateUnchanged"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index a6675c26dc..b86d6122b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,6 +181,16 @@ dependencies {
implementation "com.github.lelloman:android-identicons:$identicon_version"
}
+def canonicalVersionCode = 6
+def canonicalVersionName = "1.0.0"
+
+def postFixSize = 10
+def abiPostFix = ['armeabi-v7a' : 1,
+ 'arm64-v8a' : 2,
+ 'x86' : 3,
+ 'x86_64' : 4,
+ 'universal' : 5]
+
android {
flavorDimensions "none"
compileSdkVersion 28
@@ -192,8 +202,8 @@ android {
}
defaultConfig {
- versionCode 6
- versionName "1.0.0"
+ versionCode canonicalVersionCode * postFixSize
+ versionName canonicalVersionName
minSdkVersion 21
targetSdkVersion 28
@@ -214,9 +224,10 @@ android {
buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
+ buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
ndk {
- abiFilters 'armeabi-v7a', 'x86'
+ abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
resConfigs autoResConfig()
@@ -225,7 +236,7 @@ android {
abi {
enable true
reset()
- include 'armeabi-v7a', 'x86'
+ include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
universalApk true
}
}
@@ -295,8 +306,14 @@ android {
}
android.applicationVariants.all { variant ->
- variant.outputs.all {
- outputFileName = outputFileName.replace(".apk", "-${variant.versionName}.apk")
+ variant.outputs.each { output ->
+ output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
+ def abiName = output.getFilter("ABI") ?: 'universal'
+ def postFix = abiPostFix.get(abiName, 0)
+
+ if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
+
+ output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
}
}
@@ -322,8 +339,9 @@ android {
website.manifest.srcFile 'website/AndroidManifest.xml'
}
- lintOptions {
- abortOnError false
+ lintOptions {
+ abortOnError true
+ baseline file("lint-baseline.xml")
}
testOptions {
@@ -345,8 +363,8 @@ def assembleWebsiteDescriptor = { variant, file ->
String apkName = file.getName()
String descriptor = "{" +
- "\"versionCode\" : $project.android.defaultConfig.versionCode," +
- "\"versionName\" : \"$project.android.defaultConfig.versionName\"," +
+ "\"versionCode\" : $canonicalVersionCode," +
+ "\"versionName\" : \"$canonicalVersionName\"," +
"\"sha256sum\" : \"$digest\"," +
"\"url\" : \"$url/$apkName\"" +
"}"
@@ -427,5 +445,5 @@ static def autoResConfig() {
task qa {
group 'Verification'
description 'Quality Assurance. Run before pushing.'
- dependsOn ':testPlayReleaseUnitTest', ':assemblePlayDebug'
+ dependsOn ':testPlayReleaseUnitTest', ':lintPlayRelease', ':assemblePlayDebug'
}
diff --git a/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
new file mode 100644
index 0000000000..31dae7e99b
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/whispersystems/witness/WitnessPlugin.groovy
@@ -0,0 +1,92 @@
+package org.whispersystems.witness
+
+import org.gradle.api.InvalidUserDataException
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.ResolvedArtifact
+
+import java.security.MessageDigest
+
+class WitnessPluginExtension {
+ List verify
+ String configuration
+}
+
+class WitnessPlugin implements Plugin {
+
+ static String calculateSha256(file) {
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
+ file.eachByte 4096, {bytes, size ->
+ md.update(bytes, 0, size);
+ }
+ return md.digest().collect {String.format "%02x", it}.join();
+ }
+
+ void apply(Project project) {
+ project.extensions.create("dependencyVerification", WitnessPluginExtension)
+ project.afterEvaluate {
+ project.dependencyVerification.verify.each {
+ assertion ->
+ List parts = assertion.tokenize(":")
+ String group = parts.get(0)
+ String name = parts.get(1)
+ String hash = parts.get(2)
+
+ def artifacts = allArtifacts(project).findAll {
+ return it.name.equals(name) && it.moduleVersion.id.group.equals(group)
+ }
+
+ if (artifacts.size() > 1) {
+ throw new InvalidUserDataException("Multiple artifacts found for $group:$name, ${artifacts.size()} found")
+ }
+
+ ResolvedArtifact dependency = artifacts.find()
+
+ println "Verifying " + group + ":" + name
+
+ if (dependency == null) {
+ throw new InvalidUserDataException("No dependency for integrity assertion found: " + group + ":" + name)
+ }
+
+ if (!hash.equals(calculateSha256(dependency.file))) {
+ throw new InvalidUserDataException("Checksum failed for " + assertion)
+ }
+ }
+ }
+
+ project.task('calculateChecksums').doLast {
+ println "dependencyVerification {"
+
+ def configurationName = project.dependencyVerification.configuration
+ if (configurationName != null) {
+ println " configuration = '$configurationName'"
+ }
+
+ println " verify = ["
+
+ allArtifacts(project).each {
+ dep ->
+ println " '" + dep.moduleVersion.id.group+ ":" + dep.name + ":" + calculateSha256(dep.file) + "',"
+ }
+
+ println " ]"
+ println "}"
+ }
+ }
+
+ private static Set allArtifacts(Project project) {
+ def configurationName = project.dependencyVerification.configuration
+ project.configurations
+ .findAll { config -> config.name =~ configurationName }
+ .collectMany { tryGetArtifacts(it) }
+ }
+
+ private static Set tryGetArtifacts(Configuration configuration) {
+ try {
+ configuration.resolvedConfiguration.resolvedArtifacts
+ } catch (Exception ignored) {
+ [] as Set
+ }
+ }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties
new file mode 100644
index 0000000000..dae767f677
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/witness.properties
@@ -0,0 +1 @@
+implementation-class=org.whispersystems.witness.WitnessPlugin
diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar
deleted file mode 100644
index 53abf2bb39..0000000000
Binary files a/libs/gradle-witness.jar and /dev/null differ
diff --git a/lint-baseline.xml b/lint-baseline.xml
new file mode 100644
index 0000000000..2e4d821e45
--- /dev/null
+++ b/lint-baseline.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/protobuf/Backups.proto b/protobuf/Backups.proto
index 054c3526ef..c7efc39146 100644
--- a/protobuf/Backups.proto
+++ b/protobuf/Backups.proto
@@ -34,6 +34,11 @@ message Attachment {
optional uint32 length = 3;
}
+message Sticker {
+ optional uint64 rowId = 1;
+ optional uint32 length = 2;
+}
+
message Avatar {
optional string name = 1;
optional uint32 length = 2;
@@ -56,4 +61,5 @@ message BackupFrame {
optional DatabaseVersion version = 5;
optional bool end = 6;
optional Avatar avatar = 7;
+ optional Sticker sticker = 8;
}
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index f6adac4d80..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_light.png b/res/drawable-hdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index cec4c2ba31..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index a61dcce747..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_light.png b/res/drawable-hdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index f6adac4d80..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 79110bd85a..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index 0f40f277a7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index da39504430..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 2557bad897..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index cb37eb1f06..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_light.png b/res/drawable-hdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 97bc953d62..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 56583915da..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_light.png b/res/drawable-hdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index cb37eb1f06..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 2f07dbb658..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_light.png b/res/drawable-hdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 365785adaf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index 5c533050f1..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_light.png b/res/drawable-hdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 2f07dbb658..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 8e970200bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_light.png b/res/drawable-hdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index b6f53b41db..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 90ca0acb57..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_light.png b/res/drawable-hdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 8e970200bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_dark.png b/res/drawable-hdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 823394d6e7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_activated_light.png b/res/drawable-hdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 2ece8ceada..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_dark.png b/res/drawable-hdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 23f6b43a08..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_object_normal_light.png b/res/drawable-hdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 823394d6e7..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 787d0002cf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_activated_light.png b/res/drawable-hdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 262ea943a2..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index e581af307a..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_people_normal_light.png b/res/drawable-hdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 787d0002cf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_dark.png b/res/drawable-hdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 721281d84f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_activated_light.png b/res/drawable-hdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 78a4a39e00..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 1744eb741c..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_places_normal_light.png b/res/drawable-hdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 721281d84f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png b/res/drawable-hdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 9ee13353c8..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_activated_light.png b/res/drawable-hdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 50725d9844..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_dark.png b/res/drawable-hdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index f081e4d29b..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_recents_normal_light.png b/res/drawable-hdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 91e8542ffd..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 05fe46c8bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 76c8b1ba02..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 6f56d2d57f..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 05fe46c8bf..0000000000
Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/transfer_controls_background.9.png b/res/drawable-hdpi/transfer_controls_background.9.png
deleted file mode 100644
index c7b7f575f4..0000000000
Binary files a/res/drawable-hdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_dark.png b/res/drawable-mdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index 4a1574abea..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_light.png b/res/drawable-mdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 677223f79f..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index bfcafda8a9..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_light.png b/res/drawable-mdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 4a1574abea..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 6a94d111ba..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index a63d23cc24..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index 7945730178..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 4cec12ef16..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index ae1ca3f9d4..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_light.png b/res/drawable-mdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 2bc9f8f09b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index ede66c9761..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_light.png b/res/drawable-mdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index ae1ca3f9d4..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 785deee018..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_light.png b/res/drawable-mdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 68efa0a50e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index aed613d5bc..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_light.png b/res/drawable-mdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 785deee018..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 7de887a96e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_light.png b/res/drawable-mdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 234f2d9802..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index d63616d118..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_light.png b/res/drawable-mdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 7de887a96e..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_dark.png b/res/drawable-mdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 6206af2b2b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_activated_light.png b/res/drawable-mdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 11f25dcc69..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_dark.png b/res/drawable-mdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index cdc756575c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_object_normal_light.png b/res/drawable-mdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 6206af2b2b..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 91cae22a77..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_activated_light.png b/res/drawable-mdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 353a3100a2..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_dark.png b/res/drawable-mdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index 851df9e964..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_people_normal_light.png b/res/drawable-mdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 91cae22a77..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_dark.png b/res/drawable-mdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index ceab263b39..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_activated_light.png b/res/drawable-mdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 23ae27f140..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_dark.png b/res/drawable-mdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 67f90d42f6..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_places_normal_light.png b/res/drawable-mdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index ceab263b39..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_dark.png b/res/drawable-mdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 775f3d7504..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_activated_light.png b/res/drawable-mdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 5fb21b2ddb..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png b/res/drawable-mdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index 6c0b551073..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_recents_normal_light.png b/res/drawable-mdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index da20de7fa5..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 3aca48546c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 3db7b5a0fb..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index aa56d6b40f..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 3aca48546c..0000000000
Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/transfer_controls_background.9.png b/res/drawable-mdpi/transfer_controls_background.9.png
deleted file mode 100644
index 5e8b65b45d..0000000000
Binary files a/res/drawable-mdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable-v21/sticker_button_dark.xml b/res/drawable-v21/sticker_button_dark.xml
new file mode 100644
index 0000000000..bbd18b7e9f
--- /dev/null
+++ b/res/drawable-v21/sticker_button_dark.xml
@@ -0,0 +1,17 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/res/drawable-v21/sticker_button_light.xml b/res/drawable-v21/sticker_button_light.xml
new file mode 100644
index 0000000000..f20b4e89d1
--- /dev/null
+++ b/res/drawable-v21/sticker_button_light.xml
@@ -0,0 +1,17 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index 1d04bc797d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 7001af641f..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 68b5d8d2ff..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 1d04bc797d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index 4c75aa7cd2..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index fa46ef2bf0..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index 3be4ee4aa1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 21c3f5bdde..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index 471d644f84..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 58a1b7bf2d..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 597de87f52..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index 471d644f84..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index a49d4f55b1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 8ad2915cc8..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index e1cac3ffc7..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index a49d4f55b1..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 0b409d57ce..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index c4e2e99778..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 8bce788565..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 0b409d57ce..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index e7afca3f6e..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_light.png b/res/drawable-xhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 1b51f9e128..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 02e7ea6d44..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_light.png b/res/drawable-xhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index e7afca3f6e..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 693a1c69f6..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_light.png b/res/drawable-xhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 6ae3d264c9..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index fe91469aab..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_light.png b/res/drawable-xhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 693a1c69f6..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 0b368d62fb..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_light.png b/res/drawable-xhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index d4c49d78f2..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index fc67497e11..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_light.png b/res/drawable-xhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 0b368d62fb..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 944a180fea..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xhdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 0b07c84a6f..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index adcc1ace43..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xhdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 4dd87fe536..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index a28e4a84ad..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index a6f6ebc4e0..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 7c016ef665..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index a28e4a84ad..0000000000
Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/transfer_controls_background.9.png b/res/drawable-xhdpi/transfer_controls_background.9.png
deleted file mode 100644
index 3721dc5202..0000000000
Binary files a/res/drawable-xhdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index 5cf9101c06..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 76a4aebe5b..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 6d90599b1f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index 5cf9101c06..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png
deleted file mode 100644
index e2ec29d53d..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png
deleted file mode 100644
index 012700f0b0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png
deleted file mode 100644
index f4487745b9..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png b/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png
deleted file mode 100644
index 20c1fcde70..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_emoticons_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index 5797242bc0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index adf73cf40f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index 47f75e2cae..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index 5797242bc0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 8a0be6d505..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 784f603a50..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index ed5571a88e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 8a0be6d505..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index 15214246c2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 65947ba066..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 12a2324fd0..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index 15214246c2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 41b8604be6..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 1979f6513f..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 671eef8273..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 41b8604be6..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index 40753d285e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index 2b6ed0c163..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index 72df107d85..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index 40753d285e..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 9ae9fc7b26..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index a7fafaec64..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index dbdbd9e0cc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 9ae9fc7b26..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png
deleted file mode 100644
index 8c4a00a7d2..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png b/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png
deleted file mode 100644
index 94d7cd05c5..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png
deleted file mode 100644
index 651dc5cc01..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png b/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png
deleted file mode 100644
index 9988097d2a..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_recents_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 780b6397dc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index 2cb85bbd80..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index fc60900710..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 780b6397dc..0000000000
Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/transfer_controls_background.9.png b/res/drawable-xxhdpi/transfer_controls_background.9.png
deleted file mode 100644
index 0fa81940ce..0000000000
Binary files a/res/drawable-xxhdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png
deleted file mode 100644
index b2c61c6bd1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png
deleted file mode 100644
index 3196e256a6..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png
deleted file mode 100644
index 6745d84e54..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png
deleted file mode 100644
index b2c61c6bd1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png
deleted file mode 100644
index dced7d6383..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png
deleted file mode 100644
index 678adf4d2d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png
deleted file mode 100644
index c69c5c3e82..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png
deleted file mode 100644
index dced7d6383..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png
deleted file mode 100644
index 39455b4fc5..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png
deleted file mode 100644
index 662dbac2b9..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png
deleted file mode 100644
index c2b2432326..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png
deleted file mode 100644
index 39455b4fc5..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png
deleted file mode 100644
index e9106a7c4f..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png
deleted file mode 100644
index 9d3e7d4de7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png
deleted file mode 100644
index 2e8d684359..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png
deleted file mode 100644
index e9106a7c4f..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png
deleted file mode 100644
index 841e9f12e7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png
deleted file mode 100644
index 21bcb25ad1..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png
deleted file mode 100644
index 5541e5b849..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png
deleted file mode 100644
index 841e9f12e7..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png
deleted file mode 100644
index daa4020ce4..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png
deleted file mode 100644
index eac554f536..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png
deleted file mode 100644
index e093154a75..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png
deleted file mode 100644
index daa4020ce4..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png
deleted file mode 100644
index 1953371c4d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png
deleted file mode 100644
index 27f4935a32..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png
deleted file mode 100644
index 4088e50005..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png
deleted file mode 100644
index 1953371c4d..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png
deleted file mode 100644
index 062f031337..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png
deleted file mode 100644
index eecad27933..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png
deleted file mode 100644
index 86152fa226..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png
deleted file mode 100644
index 062f031337..0000000000
Binary files a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/transfer_controls_background.9.png b/res/drawable-xxxhdpi/transfer_controls_background.9.png
deleted file mode 100644
index e349e74058..0000000000
Binary files a/res/drawable-xxxhdpi/transfer_controls_background.9.png and /dev/null differ
diff --git a/res/drawable/emoji_category_activity_dark.xml b/res/drawable/emoji_category_activity_dark.xml
deleted file mode 100644
index 84269ce568..0000000000
--- a/res/drawable/emoji_category_activity_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_activity_light.xml b/res/drawable/emoji_category_activity_light.xml
deleted file mode 100644
index befeb3138d..0000000000
--- a/res/drawable/emoji_category_activity_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_emoticons_dark.xml b/res/drawable/emoji_category_emoticons_dark.xml
deleted file mode 100644
index 3209fe5448..0000000000
--- a/res/drawable/emoji_category_emoticons_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_emoticons_light.xml b/res/drawable/emoji_category_emoticons_light.xml
deleted file mode 100644
index 8777fb389a..0000000000
--- a/res/drawable/emoji_category_emoticons_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_flags_dark.xml b/res/drawable/emoji_category_flags_dark.xml
deleted file mode 100644
index 41416774f3..0000000000
--- a/res/drawable/emoji_category_flags_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_flags_light.xml b/res/drawable/emoji_category_flags_light.xml
deleted file mode 100644
index 2f61d042d2..0000000000
--- a/res/drawable/emoji_category_flags_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_foods_dark.xml b/res/drawable/emoji_category_foods_dark.xml
deleted file mode 100644
index 650de4343a..0000000000
--- a/res/drawable/emoji_category_foods_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_foods_light.xml b/res/drawable/emoji_category_foods_light.xml
deleted file mode 100644
index 475bd21352..0000000000
--- a/res/drawable/emoji_category_foods_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_nature_dark.xml b/res/drawable/emoji_category_nature_dark.xml
deleted file mode 100644
index e54e35885a..0000000000
--- a/res/drawable/emoji_category_nature_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_nature_light.xml b/res/drawable/emoji_category_nature_light.xml
deleted file mode 100644
index f21883347e..0000000000
--- a/res/drawable/emoji_category_nature_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml
deleted file mode 100644
index 3eb67ce51c..0000000000
--- a/res/drawable/emoji_category_objects_dark.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_objects_light.xml b/res/drawable/emoji_category_objects_light.xml
deleted file mode 100644
index 83421c32c0..0000000000
--- a/res/drawable/emoji_category_objects_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_people_dark.xml b/res/drawable/emoji_category_people_dark.xml
deleted file mode 100644
index 8ffc79c280..0000000000
--- a/res/drawable/emoji_category_people_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_people_light.xml b/res/drawable/emoji_category_people_light.xml
deleted file mode 100644
index 639af154ce..0000000000
--- a/res/drawable/emoji_category_people_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_places_dark.xml b/res/drawable/emoji_category_places_dark.xml
deleted file mode 100644
index fa62492587..0000000000
--- a/res/drawable/emoji_category_places_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_places_light.xml b/res/drawable/emoji_category_places_light.xml
deleted file mode 100644
index 51d7a8a879..0000000000
--- a/res/drawable/emoji_category_places_light.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/emoji_category_recent_dark.xml b/res/drawable/emoji_category_recent_dark.xml
deleted file mode 100644
index 5d8581dbaf..0000000000
--- a/res/drawable/emoji_category_recent_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_recent_light.xml b/res/drawable/emoji_category_recent_light.xml
deleted file mode 100644
index ea5c1cc77c..0000000000
--- a/res/drawable/emoji_category_recent_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_symbol_dark.xml b/res/drawable/emoji_category_symbol_dark.xml
deleted file mode 100644
index e98cbee842..0000000000
--- a/res/drawable/emoji_category_symbol_dark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/emoji_category_symbol_light.xml b/res/drawable/emoji_category_symbol_light.xml
deleted file mode 100644
index d3cc7c8fbb..0000000000
--- a/res/drawable/emoji_category_symbol_light.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/res/drawable/ic_arrow_down.xml b/res/drawable/ic_arrow_down.xml
new file mode 100644
index 0000000000..2afc613651
--- /dev/null
+++ b/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_arrow_down_circle_filled.xml b/res/drawable/ic_arrow_down_circle_filled.xml
new file mode 100644
index 0000000000..be0bc5b4ac
--- /dev/null
+++ b/res/drawable/ic_arrow_down_circle_filled.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_activity_dark_20.xml b/res/drawable/ic_emoji_activity_dark_20.xml
new file mode 100644
index 0000000000..7772677cd1
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_activity_light_20.xml b/res/drawable/ic_emoji_activity_light_20.xml
new file mode 100644
index 0000000000..809d801ee8
--- /dev/null
+++ b/res/drawable/ic_emoji_activity_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_animal_dark_20.xml b/res/drawable/ic_emoji_animal_dark_20.xml
new file mode 100644
index 0000000000..8ddbc2e127
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_animal_light_20.xml b/res/drawable/ic_emoji_animal_light_20.xml
new file mode 100644
index 0000000000..63f2f9e10c
--- /dev/null
+++ b/res/drawable/ic_emoji_animal_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_emoticon_dark_20.xml b/res/drawable/ic_emoji_emoticon_dark_20.xml
new file mode 100644
index 0000000000..6a1b096cc0
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_emoticon_light_20.xml b/res/drawable/ic_emoji_emoticon_light_20.xml
new file mode 100644
index 0000000000..8b5df632c6
--- /dev/null
+++ b/res/drawable/ic_emoji_emoticon_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled.xml b/res/drawable/ic_emoji_filled.xml
new file mode 100644
index 0000000000..ed160bb6d5
--- /dev/null
+++ b/res/drawable/ic_emoji_filled.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled_keyboard_dark.xml b/res/drawable/ic_emoji_filled_keyboard_dark.xml
new file mode 100644
index 0000000000..e0429d88fe
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_dark.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_filled_keyboard_light.xml b/res/drawable/ic_emoji_filled_keyboard_light.xml
new file mode 100644
index 0000000000..ed8a86b40a
--- /dev/null
+++ b/res/drawable/ic_emoji_filled_keyboard_light.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/res/drawable/ic_emoji_flag_dark_20.xml b/res/drawable/ic_emoji_flag_dark_20.xml
new file mode 100644
index 0000000000..1b1d730edb
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_flag_light_20.xml b/res/drawable/ic_emoji_flag_light_20.xml
new file mode 100644
index 0000000000..f5b87e490c
--- /dev/null
+++ b/res/drawable/ic_emoji_flag_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_food_dark_20.xml b/res/drawable/ic_emoji_food_dark_20.xml
new file mode 100644
index 0000000000..36b786fce8
--- /dev/null
+++ b/res/drawable/ic_emoji_food_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_food_light_20.xml b/res/drawable/ic_emoji_food_light_20.xml
new file mode 100644
index 0000000000..49898b5a2f
--- /dev/null
+++ b/res/drawable/ic_emoji_food_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_object_dark_20.xml b/res/drawable/ic_emoji_object_dark_20.xml
new file mode 100644
index 0000000000..44934dd47d
--- /dev/null
+++ b/res/drawable/ic_emoji_object_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_object_light_20.xml b/res/drawable/ic_emoji_object_light_20.xml
new file mode 100644
index 0000000000..6aa4c053e6
--- /dev/null
+++ b/res/drawable/ic_emoji_object_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_outline.xml b/res/drawable/ic_emoji_outline.xml
new file mode 100644
index 0000000000..943277e7a3
--- /dev/null
+++ b/res/drawable/ic_emoji_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_outline_keyboard.xml b/res/drawable/ic_emoji_outline_keyboard.xml
new file mode 100644
index 0000000000..943277e7a3
--- /dev/null
+++ b/res/drawable/ic_emoji_outline_keyboard.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_people_dark_20.xml b/res/drawable/ic_emoji_people_dark_20.xml
new file mode 100644
index 0000000000..c28e8c86c9
--- /dev/null
+++ b/res/drawable/ic_emoji_people_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_people_light_20.xml b/res/drawable/ic_emoji_people_light_20.xml
new file mode 100644
index 0000000000..26867afd88
--- /dev/null
+++ b/res/drawable/ic_emoji_people_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_symbol_dark_20.xml b/res/drawable/ic_emoji_symbol_dark_20.xml
new file mode 100644
index 0000000000..c2049dc470
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_symbol_light_20.xml b/res/drawable/ic_emoji_symbol_light_20.xml
new file mode 100644
index 0000000000..5a5b27697b
--- /dev/null
+++ b/res/drawable/ic_emoji_symbol_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_travel_dark_20.xml b/res/drawable/ic_emoji_travel_dark_20.xml
new file mode 100644
index 0000000000..c22c93c470
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_emoji_travel_light_20.xml b/res/drawable/ic_emoji_travel_light_20.xml
new file mode 100644
index 0000000000..6a0448e21b
--- /dev/null
+++ b/res/drawable/ic_emoji_travel_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_forward_outline.xml b/res/drawable/ic_forward_outline.xml
new file mode 100644
index 0000000000..d1463dda12
--- /dev/null
+++ b/res/drawable/ic_forward_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_mic_filled_24.xml b/res/drawable/ic_mic_filled_24.xml
new file mode 100644
index 0000000000..acffc548c3
--- /dev/null
+++ b/res/drawable/ic_mic_filled_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_plus_24.xml b/res/drawable/ic_plus_24.xml
new file mode 100644
index 0000000000..d287574e12
--- /dev/null
+++ b/res/drawable/ic_plus_24.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_recent_dark_20.xml b/res/drawable/ic_recent_dark_20.xml
new file mode 100644
index 0000000000..7cb39ce596
--- /dev/null
+++ b/res/drawable/ic_recent_dark_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_recent_light_20.xml b/res/drawable/ic_recent_light_20.xml
new file mode 100644
index 0000000000..1e888e4f6c
--- /dev/null
+++ b/res/drawable/ic_recent_light_20.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled.xml b/res/drawable/ic_sticker_filled.xml
new file mode 100644
index 0000000000..9b4b5c566a
--- /dev/null
+++ b/res/drawable/ic_sticker_filled.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled_keyboard_dark.xml b/res/drawable/ic_sticker_filled_keyboard_dark.xml
new file mode 100644
index 0000000000..b8a968b034
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_dark.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_filled_keyboard_light.xml b/res/drawable/ic_sticker_filled_keyboard_light.xml
new file mode 100644
index 0000000000..d4db977f52
--- /dev/null
+++ b/res/drawable/ic_sticker_filled_keyboard_light.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_outline.xml b/res/drawable/ic_sticker_outline.xml
new file mode 100644
index 0000000000..d2f6e5bb03
--- /dev/null
+++ b/res/drawable/ic_sticker_outline.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_sticker_outline_keyboard.xml b/res/drawable/ic_sticker_outline_keyboard.xml
new file mode 100644
index 0000000000..d2f6e5bb03
--- /dev/null
+++ b/res/drawable/ic_sticker_outline_keyboard.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/ic_triangle_down.xml b/res/drawable/ic_triangle_down.xml
new file mode 100644
index 0000000000..9ff7fc1c8c
--- /dev/null
+++ b/res/drawable/ic_triangle_down.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_left.xml b/res/drawable/ic_triangle_left.xml
new file mode 100644
index 0000000000..571c2b3ca5
--- /dev/null
+++ b/res/drawable/ic_triangle_left.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_right.xml b/res/drawable/ic_triangle_right.xml
new file mode 100644
index 0000000000..f14e6941d0
--- /dev/null
+++ b/res/drawable/ic_triangle_right.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_triangle_up.xml b/res/drawable/ic_triangle_up.xml
new file mode 100644
index 0000000000..b8736e3422
--- /dev/null
+++ b/res/drawable/ic_triangle_up.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/res/drawable/ic_x.xml b/res/drawable/ic_x.xml
new file mode 100644
index 0000000000..4fa8aa41a3
--- /dev/null
+++ b/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/res/drawable/media_keyboard_selected_background_dark.xml b/res/drawable/media_keyboard_selected_background_dark.xml
new file mode 100644
index 0000000000..b41f2cf6d8
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_dark.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/media_keyboard_selected_background_light.xml b/res/drawable/media_keyboard_selected_background_light.xml
new file mode 100644
index 0000000000..e0afb0fc4a
--- /dev/null
+++ b/res/drawable/media_keyboard_selected_background_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/remove_button_state.xml b/res/drawable/remove_button_state.xml
new file mode 100644
index 0000000000..89c87b25ca
--- /dev/null
+++ b/res/drawable/remove_button_state.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_button_dark.xml b/res/drawable/sticker_button_dark.xml
new file mode 100644
index 0000000000..646748d34b
--- /dev/null
+++ b/res/drawable/sticker_button_dark.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_button_light.xml b/res/drawable/sticker_button_light.xml
new file mode 100644
index 0000000000..97fcffe0fb
--- /dev/null
+++ b/res/drawable/sticker_button_light.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_management_empty_background.xml b/res/drawable/sticker_management_empty_background.xml
new file mode 100644
index 0000000000..63855710d8
--- /dev/null
+++ b/res/drawable/sticker_management_empty_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_missing_background_dark.xml b/res/drawable/sticker_missing_background_dark.xml
new file mode 100644
index 0000000000..b41f2cf6d8
--- /dev/null
+++ b/res/drawable/sticker_missing_background_dark.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/sticker_missing_background_light.xml b/res/drawable/sticker_missing_background_light.xml
new file mode 100644
index 0000000000..fdc4810c96
--- /dev/null
+++ b/res/drawable/sticker_missing_background_light.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/tooltip_background.xml b/res/drawable/tooltip_background.xml
new file mode 100644
index 0000000000..900668e094
--- /dev/null
+++ b/res/drawable/tooltip_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/transfer_controls_background.xml b/res/drawable/transfer_controls_background.xml
new file mode 100644
index 0000000000..1ba1aa2ece
--- /dev/null
+++ b/res/drawable/transfer_controls_background.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/album_thumbnail_view.xml b/res/layout/album_thumbnail_view.xml
index 3bac5cb0e1..11af8b53fb 100644
--- a/res/layout/album_thumbnail_view.xml
+++ b/res/layout/album_thumbnail_view.xml
@@ -13,8 +13,8 @@
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 4672c46636..fc87bafa80 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,108 +1,131 @@
-
-
-
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/conversation_list_toolbar_background"
+ android:theme="?attr/actionBarStyle"
+ app:contentInsetStartWithNavigation="0dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:navigationIcon="?homeAsUpIndicator"
+ tools:background="#ff007f00">
-
+
-
+
-
+
-
-
-
-
-
+ android:clipToPadding="false"
+ android:gravity="bottom"
+ android:orientation="vertical"
+ android:paddingTop="?attr/actionBarSize">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
diff --git a/res/layout/conversation_activity_emojidrawer_stub.xml b/res/layout/conversation_activity_emojidrawer_stub.xml
index d29a342eaa..c52ae1d333 100644
--- a/res/layout/conversation_activity_emojidrawer_stub.xml
+++ b/res/layout/conversation_activity_emojidrawer_stub.xml
@@ -1,5 +1,5 @@
-
+
+
+
+
+ android:paddingEnd="16dp"
+ android:paddingBottom="6dp">
-
-
-
+ android:clipToPadding="false">
-
-
-
-
-
+ android:clipToPadding="false"
+ android:orientation="vertical">
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
+
-
+
-
+
-
+
+
+ android:layout_height="match_parent"
+ android:layout_gravity="right|end"
+ android:visibility="gone">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index bab8911673..90a1c6917e 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -130,6 +130,12 @@
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_received_thumbnail" />
+
+
+
+
+
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 6b6ede6eb7..86fdc3eeec 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -70,6 +70,12 @@
android:layout_height="wrap_content"
android:layout="@layout/conversation_item_sent_thumbnail" />
+
+
+
+
+
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index f16882db49..b4abaf761d 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -2,30 +2,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_dark.xml b/res/layout/emoji_keyboard_icon_dark.xml
new file mode 100644
index 0000000000..cc906e4d06
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_dark_selected.xml b/res/layout/emoji_keyboard_icon_dark_selected.xml
new file mode 100644
index 0000000000..1abaf57d49
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_light.xml b/res/layout/emoji_keyboard_icon_light.xml
new file mode 100644
index 0000000000..7d7f2fe269
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/emoji_keyboard_icon_light_selected.xml b/res/layout/emoji_keyboard_icon_light_selected.xml
new file mode 100644
index 0000000000..c833b4191d
--- /dev/null
+++ b/res/layout/emoji_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml
new file mode 100644
index 0000000000..35320d4f46
--- /dev/null
+++ b/res/layout/media_keyboard.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/media_keyboard_bottom_tab_item.xml b/res/layout/media_keyboard_bottom_tab_item.xml
new file mode 100644
index 0000000000..a80ee8cb6d
--- /dev/null
+++ b/res/layout/media_keyboard_bottom_tab_item.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/microphone_recorder_view.xml b/res/layout/microphone_recorder_view.xml
index 986bed2dba..ace424f178 100644
--- a/res/layout/microphone_recorder_view.xml
+++ b/res/layout/microphone_recorder_view.xml
@@ -6,14 +6,15 @@
+ android:scaleType="fitCenter"
+ android:tint="?compose_icon_tint"
+ app:srcCompat="@drawable/ic_mic_filled_24" />
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index fbcc588fc2..c9b105c593 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -168,7 +168,7 @@
android:text="@string/profile_create_activity__set_later"
android:textColor="@color/gray50" />
-
-
diff --git a/res/layout/scribble_select_sticker_fragment.xml b/res/layout/scribble_select_sticker_fragment.xml
index 805a3bc80d..d8ffa275ac 100644
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@@ -1,6 +1,9 @@
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/stickers_recycler_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="4dp"
+ android:clipToPadding="false"
+ android:clipChildren="false"/>
diff --git a/res/layout/sticker_keyboard_icon_dark.xml b/res/layout/sticker_keyboard_icon_dark.xml
new file mode 100644
index 0000000000..d0658ef8cd
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_dark_selected.xml b/res/layout/sticker_keyboard_icon_dark_selected.xml
new file mode 100644
index 0000000000..42a93ba985
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_dark_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_light.xml b/res/layout/sticker_keyboard_icon_light.xml
new file mode 100644
index 0000000000..5edaeb5b56
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_icon_light_selected.xml b/res/layout/sticker_keyboard_icon_light_selected.xml
new file mode 100644
index 0000000000..2fe1507818
--- /dev/null
+++ b/res/layout/sticker_keyboard_icon_light_selected.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_keyboard_page.xml b/res/layout/sticker_keyboard_page.xml
new file mode 100644
index 0000000000..e64252d4d0
--- /dev/null
+++ b/res/layout/sticker_keyboard_page.xml
@@ -0,0 +1,8 @@
+
+
diff --git a/res/layout/sticker_keyboard_page_list_item.xml b/res/layout/sticker_keyboard_page_list_item.xml
new file mode 100644
index 0000000000..cb56ced74e
--- /dev/null
+++ b/res/layout/sticker_keyboard_page_list_item.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_management_activity.xml b/res/layout/sticker_management_activity.xml
new file mode 100644
index 0000000000..72c5068f36
--- /dev/null
+++ b/res/layout/sticker_management_activity.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_management_empty_item.xml b/res/layout/sticker_management_empty_item.xml
new file mode 100644
index 0000000000..efb51797bc
--- /dev/null
+++ b/res/layout/sticker_management_empty_item.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/sticker_management_header_item.xml b/res/layout/sticker_management_header_item.xml
new file mode 100644
index 0000000000..8971080e1f
--- /dev/null
+++ b/res/layout/sticker_management_header_item.xml
@@ -0,0 +1,14 @@
+
+
diff --git a/res/layout/sticker_management_sticker_item.xml b/res/layout/sticker_management_sticker_item.xml
new file mode 100644
index 0000000000..b766dfef42
--- /dev/null
+++ b/res/layout/sticker_management_sticker_item.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml
new file mode 100644
index 0000000000..cbf165c120
--- /dev/null
+++ b/res/layout/sticker_preview_activity.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_preview_list_item.xml b/res/layout/sticker_preview_list_item.xml
new file mode 100644
index 0000000000..464d98a8fb
--- /dev/null
+++ b/res/layout/sticker_preview_list_item.xml
@@ -0,0 +1,6 @@
+
+
diff --git a/res/layout/sticker_preview_popup.xml b/res/layout/sticker_preview_popup.xml
new file mode 100644
index 0000000000..92ce17a520
--- /dev/null
+++ b/res/layout/sticker_preview_popup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_suggestion_list_item.xml b/res/layout/sticker_suggestion_list_item.xml
new file mode 100644
index 0000000000..b4fe548cf9
--- /dev/null
+++ b/res/layout/sticker_suggestion_list_item.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/sticker_view.xml b/res/layout/sticker_view.xml
new file mode 100644
index 0000000000..3dfd2b289b
--- /dev/null
+++ b/res/layout/sticker_view.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 53042951d4..91a4b9c5c8 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -45,8 +45,8 @@
diff --git a/res/layout/tooltip.xml b/res/layout/tooltip.xml
new file mode 100644
index 0000000000..db4122b4a1
--- /dev/null
+++ b/res/layout/tooltip.xml
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/transfer_controls_stub.xml b/res/layout/transfer_controls_stub.xml
index 63c6545c11..84a998c0ea 100644
--- a/res/layout/transfer_controls_stub.xml
+++ b/res/layout/transfer_controls_stub.xml
@@ -1,8 +1,9 @@
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/transfer_controls"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:elevation="2dp"
+ android:orientation="vertical" />
diff --git a/res/layout/transfer_controls_view.xml b/res/layout/transfer_controls_view.xml
index 2890f62a04..7a54d547b7 100644
--- a/res/layout/transfer_controls_view.xml
+++ b/res/layout/transfer_controls_view.xml
@@ -1,40 +1,54 @@
-
+
+ android:id="@+id/progress_wheel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:visibility="gone"
+ android:padding="4dp"
+ app:matProg_barColor="@color/core_blue"
+ app:matProg_rimColor="@color/core_grey_05"
+ app:matProg_linearProgress="true"
+ app:matProg_spinSpeed="0.2"
+ app:matProg_barWidth="2dp"
+ app:matProg_rimWidth="2dp"
+ app:matProg_circleRadius="24dp"
+ tools:visibility="visible"/>
+ android:orientation="horizontal"
+ android:visibility="gone"
+ tools:visibility="visible">
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:tint="@color/core_grey_60"
+ app:srcCompat="@drawable/ic_arrow_down_circle_filled" />
-
+ android:textColor="@color/black" />
diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml
new file mode 100644
index 0000000000..752864db10
--- /dev/null
+++ b/res/values-v21/themes.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 836d8a3c9a..74468f35b8 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -38,6 +38,7 @@
+
@@ -47,12 +48,15 @@
+
+
+
-
+
@@ -66,9 +70,12 @@
+
+
+
@@ -117,6 +124,8 @@
+
+
@@ -166,6 +175,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index beb118a018..e9e32991cc 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,6 +62,9 @@
#400099cc
#40ffffff
+ @color/conversation_crimson
+ @color/core_blue
+
#99ffffff
#00FFFFFF
#00000000
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f1b494bd82..0ddbef44e4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,10 +46,14 @@
240dp
100dp
320dp
+ 128dp
175dp
85dp
+ 5dp
+ 4dp
+
120dp
4dp
@@ -72,6 +76,15 @@
52dp
+ 8dp
+ 88dp
+ 8dp
+ 96dp
+
+ 16dp
+
+ 8dp
+
150dp
70dp
16dp
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ac56cf60e..aa74e59bcc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,7 @@
Loki Messenger
+ https://signal.org/install
Yes
No
Delete
@@ -91,6 +92,7 @@
No web browser found.
+ A cellular call is already in progress.
Your safety number with %1$s has changed. This could either mean that someone is trying to intercept your communication, or that %2$s simply reinstalled Signal.
@@ -158,7 +160,6 @@
Insecure MMS
Loki Messenger
Let\'s switch to Signal %1$s
- Let\'s use this to chat: %1$s
Error leaving group
Please choose a contact
Unblock this contact?
@@ -186,6 +187,9 @@
%1$d of %2$d
No results
+ Sticker pack installed
+ New! Say it with stickers
+
- %d unread message
@@ -642,6 +646,7 @@
Image
+ Sticker
Audio
Video
@@ -657,6 +662,26 @@
%s reset the secure session.
Duplicate message.
+
+ Stickers
+
+
+ Installed Stickers
+ Stickers You Received
+ Signal Artist Series
+ No stickers installed
+ Stickers from incoming messages will appear here
+ Untitled
+ Unknown
+
+
+ Untitled
+ Unknown
+ Install
+ Remove
+ Stickers
+ Failed to load sticker pack
+
Group updated
Left the group
@@ -751,6 +776,7 @@
Mark all as read
Mark read
Media message
+ Sticker
Reply
Signal Message
Unsecured SMS
@@ -901,6 +927,7 @@
Audio
Video
Photo
+ Sticker
Document
You
Original message not found
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a456ad1cda..155b8d2064 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,6 +1,6 @@
-
+
-
+
+
+
+
@@ -131,6 +139,8 @@
- @drawable/ic_document_small_light
- @drawable/ic_document_large_light
+ - @color/core_grey_60
+
- @drawable/conversation_list_item_background
- @color/core_grey_90
- @color/core_grey_60
@@ -155,7 +165,8 @@
- @drawable/ic_send_sms_insecure
- @drawable/ic_send_push
- @color/white
- - @drawable/ic_mood_grey600_24dp
+ - @drawable/ic_emoji_filled_keyboard_light
+ - @drawable/ic_sticker_filled_keyboard_light
- @drawable/ic_keyboard_grey600_24dp
- @drawable/ic_photo_camera_light
- @drawable/ic_image_light
@@ -165,27 +176,31 @@
- @drawable/ic_attach_grey600_24dp
- @color/gray65
- @color/black
+ - @color/core_grey_60
+ - @color/core_grey_60
+ - @color/core_grey_95
- @drawable/contact_list_divider_light
- @color/core_grey_05
- - @color/gray12
+ - @color/core_grey_05
- #66555555
- #44555555
- @color/gray20
+ - @color/core_grey_02
- @color/black
- - @drawable/emoji_category_recent_light
- - @drawable/emoji_category_people_light
- - @drawable/emoji_category_nature_light
- - @drawable/emoji_category_foods_light
- - @drawable/emoji_category_activity_light
- - @drawable/emoji_category_places_light
- - @drawable/emoji_category_objects_light
- - @drawable/emoji_category_symbol_light
- - @drawable/emoji_category_flags_light
- - @drawable/emoji_category_emoticons_light
+ - @drawable/ic_recent_light_20
+ - @drawable/ic_emoji_people_light_20
+ - @drawable/ic_emoji_animal_light_20
+ - @drawable/ic_emoji_food_light_20
+ - @drawable/ic_emoji_activity_light_20
+ - @drawable/ic_emoji_travel_light_20
+ - @drawable/ic_emoji_object_light_20
+ - @drawable/ic_emoji_symbol_light_20
+ - @drawable/ic_emoji_flag_light_20
+ - @drawable/ic_emoji_emoticon_light_20
- @drawable/emoji_variation_selector_background_light
- @color/core_grey_05
@@ -227,6 +242,8 @@
- @color/core_grey_60
- @color/core_grey_25
+ - @color/core_grey_60
+
- @drawable/ic_add_white_24dp
- @drawable/ic_group_white_24dp
- @drawable/ic_search_white_24dp
@@ -251,6 +268,17 @@
- #ff1d85d7
+ - @drawable/sticker_button_light
+ - @color/core_grey_15
+ - @color/core_grey_05
+ - @color/core_grey_90
+ - @color/transparent_white_aa
+ - @color/core_white
+ - @color/core_grey_05
+ - @drawable/sticker_missing_background_light
+
+ - @color/core_white
+
- @color/textsecure_primary_dark
- @drawable/preference_divider_light
@@ -270,7 +298,11 @@
- @color/black
-
+
+