diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 405cc9f320b..ebe39c7b8ff 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,33 +1,41 @@ - +Let's begin with a checklist: replace the empty checkboxes [ ] below with checked ones [x] accordingly --> - I have: - [ ] searched open and closed issues for duplicates - [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports +---------------------------------------- + ### Bug description +Describe here the issue that you are experiencing. ### Steps to reproduce -- add your steps here -- as a list -- using hyphens +- using hyphens as bullet points +- list the steps +- that reproduce the bug -### Screenshots - +**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour) +**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour) -### Device info - - **Model:** Manufacturer Model XVI +### Screenshots + - **Android version:** 0.0.0 - **Signal version:** 0.0.0 +### Device info + +**Device:** Manufacturer Model XVI +**Android version:** 0.0.0 +**Signal version:** 0.0.0 ### Link to debug log + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1bae5c5f473..06aa056012b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,18 +1,23 @@ - + ### First time contributor checklist - + - [ ] I have read [how to contribute](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md) to this project -- [ ] I have signed the [Contributor Licence Agreement](https://whispersystems.org/cla/) ### Contributor checklist - + - [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines) - [ ] I have tested my contribution on these devices: * Device A, Android X.Y.Z * Device B, Android Z.Y + * Virtual device W, Android Y.Y.Z - [ ] My contribution is fully baked and ready to be merged as is -- [ ] I have made the choice whether I want the Bithub reward or not by omitting or adding the word `FREEBIE` in my commit message +- [ ] I ensure that all the open issues my contribution fixes are mentioned in the commit message of my first commit using the `Fixes #1234` [syntax](https://help.github.com/articles/closing-issues-via-commit-messages/) +- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in the commit message of my first commit ---------- ### Description + diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..02bcc716156 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "libs/libtextsecure-java"] + path = libs/libtextsecure-java + url = https://github.com/LibreSignal/libtextsecure-java.git +[submodule "libs/android-support-v4-preferencefragment"] + path = libs/android-support-v4-preferencefragment + url = https://github.com/kolavar/android-support-v4-preferencefragment.git +[submodule "libs/org.w3c.dom"] + path = libs/org.w3c.dom + url = https://github.com/SMSSecure/org.w3c.dom.git +[submodule "libs/ShortcutBadger"] + path = libs/ShortcutBadger + url = https://github.com/WhisperSystems/ShortcutBadger.git +[submodule "libs/PhotoView"] + path = libs/PhotoView + url = https://github.com/chrisbanes/PhotoView.git diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6b0ff555dc8..55ad0dfdc36 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="221" + android:versionName="3.25.3"> @@ -97,16 +97,12 @@ android:allowBackup="false" android:theme="@style/TextSecure.LightTheme"> - - - - + + + - + + @@ -262,11 +262,9 @@ android:windowSoftInputMode="stateHidden" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> - - - + + + + @@ -454,6 +461,21 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BUILDING.md b/BUILDING.md index 4aded97c9d7..dec48b976cb 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,33 +1,40 @@ -Building Signal +Building LibreSignal =============== Basics ------ -Signal uses [Gradle](http://gradle.org) to build the project and to maintain -dependencies. However, you needn't install it yourself; the -"gradle wrapper" `gradlew`, mentioned below, will do that for you. +LibreSignal uses [Gradle](http://gradle.org) to build the project and to maintain dependencies. However, you needn't install it yourself; the "gradle wrapper" `gradlew`, mentioned below, will do that for you. -Building Signal +Building LibreSignal --------------- -The following steps should help you (re)build Signal from the command line. +The following steps should help you (re)build LibreSignal from the command line. -1. Checkout the Signal-Android project source with the command: +1. Checkout the LibreSignal project source and all submodules with the command (`git` 1.6.5 or higher): + + git clone --recursive https://github.com/LibreSignal/LibreSignal.git - git clone https://github.com/WhisperSystems/Signal-Android.git -2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed. +2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) and [Android NDK](https://developer.android.com/ndk/index.html) installed. 3. Ensure that the following packages are installed from the Android SDK manager: * Android SDK Build Tools * SDK Platform (API level 22) * Android Support Repository - * Google Repository -4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it. For example: +4. Create a local.properties file at the root of your source checkout and add the sdk.dir and ndk.dir entries to it. For example: - sdk.dir=/Application/android-sdk-macosx + sdk.dir=/home/username/android-sdk + ndk.dir=/home/username/android-ndk -5. Execute Gradle: +5. Compile NDK code: + + ndk-build --directory=jni + +6. Gradle clean: + + ./gradlew clean + +7. Gradle build: ./gradlew build @@ -39,8 +46,8 @@ Source assets tend to be large binary blobs, which are best stored outside of gi Sample command for generating our audio placeholder image: ```bash -pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light -pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light +pngs_from_svg.py ic_audio.svg /path/to/LibreSignal/res/ 150 --color #000 --opacity 0.54 --suffix _light +pngs_from_svg.py ic_audio.svg /path/to/LibreSignal/res/ 150 --color #fff --opacity 1.00 --suffix _light ``` Setting up a development environment @@ -53,7 +60,7 @@ Setting up a development environment 3. From the Quickstart panel, choose "Configure" then "SDK Manager". 4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel. 5. From the Quickstart panel, choose "Checkout from Version Control" then "git". -6. Paste the URL for the Signal-Android project when prompted (https://github.com/WhisperSystems/Signal-Android.git). +6. Paste the URL for the LibreSignal-Android project when prompted (https://github.com/LibreSignal/LibreSignal.git). 7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes". 9. Default config options should be good enough. 9. Project initialisation and build should proceed. @@ -62,11 +69,3 @@ Contributing code ----------------- Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests). - -Mailing list ------------- - -Development discussion happens on the whispersystems mailing list. -[To join](https://lists.riseup.net/www/info/whispersystems) -Send emails to whispersystems@lists.riseup.net - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a41a4626a6..dcea34be81a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,10 @@ -# Contributing to Signal Android +# Contributing to LibreSignal for Android -Thank you for deciding to help this project! If you have contributed to other open source projects before please note that some conventions here might be a bit different than what you have been used to. Reading this document will save you, other contributors and the developers time. +Thank you for deciding to help this project! + +**Before contributing to LibreSignal, think about adding your code to [Signal-Android](https://github.com/WhisperSystems/Signal-Android/wiki), as we pull from there.** + +If you have contributed to other open source projects before please note that some conventions here might be a bit different than what you have been used to. Reading this document will save you, other contributors and the developers time. ## Development Ideology @@ -27,16 +31,10 @@ Please do not submit issues or pull requests for translation fixes. Anyone can u 1. Read the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug. ### Issue tracker is for bugs -The main purpose of this issue tracker is to track bugs for the Android client. Relevant, concise and to the point comments that help to solve the issue are very welcome. - -##### Send support questions to support -Please do **not** ask support questions at the issue tracker. We want to help you using Signal and we have created our support system just for that. You can reach support by sending email to support@whispersystems.org or by going to our [Support Center](http://support.whispersystems.org). You can also search for existing troubleshooting articles at the [Support Center](http://support.whispersystems.org). - -##### Not a discussion forum -Please do **not** use this issue tracker as a discussion forum. Discussion related to the bug in question should of course go to the issue itself. However other discussion should take place at the [community forum](https://whispersystems.discoursehosting.net). You can use that forum to discuss any Signal related topics or to just hang out with your fellow users. +The main purpose of this issue tracker is to track bugs for the Android client. Relevant, concise and to the point comments that help to solve the issue are very welcome. Please do **not** use this issue tracker as a discussion forum. Discussion related to the bug in question should of course go to the issue itself. ### Don't bump issues -Every time someone comments on an issue, GitHub sends email to [everyone who is watching](https://github.com/WhisperSystems/Signal-Android/watchers) the repository (currently around 500 people). Thus bumping issues with :+1:s, _me toos_ or asking for updates just generate unnecessary email notifications. Moreover bumping an issue does not help solving it. Please be respectful to everyone's time and try to only comment when you have relevant new information to add. +Every time someone comments on an issue, GitHub sends email to [everyone who is watching](https://github.com/LibreSignal/LibreSignal/watchers) the repository. Thus bumping issues with :+1:s, _me toos_ or asking for updates just generate unnecessary email notifications. Moreover bumping an issue does not help solving it. Please be respectful to everyone's time and try to only comment when you have relevant new information to add. ### Open issues @@ -46,13 +44,12 @@ Have you followed all the points in the [Submitting useful bug reports guide](ht ### Closed issues #### "My issue was closed without giving a reason!" -Please understand that writing detailed explanations every time for every issue someone comes up with takes time. Sometimes a reason has been posted earlier to another related issue which you can search for. It's also possible that your issue was not in line with the guidelines of the project (see especially the [Development Ideology](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md#development-ideology)). Or it was just simply decided that the issue is not something that Signal should do at this time. +Please understand that writing detailed explanations every time for every issue someone comes up with takes time. Sometimes a reason has been posted earlier to another related issue which you can search for. It's also possible that your issue was not in line with the guidelines of the project (see especially the [Development Ideology](https://github.com/LibreSignal/LibreSignal/blob/master/CONTRIBUTING.md#development-ideology)). Or it was just simply decided that the issue is not something that LibreSignal should do at this time. ## Pull requests -### Sign the Contributor Licence Agreement (CLA) -You need to sign our CLA before your pull request can be merged. You can sign it at: https://whispersystems.org/cla/ +Please read the documentation on [how to use pull requests](https://help.github.com/articles/using-pull-requests/). ### Follow the Code Style Guidelines Before submitting a pull request please check that your code adheres to the [Code style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines). @@ -66,23 +63,14 @@ Please do not try to change too much at once. Big changes are less likely to be ### Merging can sometimes take a while If your pull request follows all the advice above but still has not been merged it usually means the developers haven't simply had the time to review it yet. We understand that this might feel frustrating. We are sorry! -### Bithub -Accepted pull requests will be rewarded with Bitcoins! After your pull request has been merged you will automatically receive an email to the address you have specified as your Git commit email. Follow the instructions in the email to claim your coins. If you wish to submit your contribution for free please add the word `FREEBIE` in your Git commit message. You may wish to explore some previously merged commits to see how it all works. - - ## How can I contribute? Any one can help by - advising new people about the guidelines of this project - - redirecting support questions to support@whispersystems.org and the [support site](http://support.whispersystems.org) - - redirecting non-bug related discussions to the [community forum](https://whispersystems.discoursehosting.net) -- improving documentation at the [wiki](https://github.com/WhisperSystems/Signal-Android/wiki) +- improving documentation at the [original Signal wiki](https://github.com/WhisperSystems/Signal-Android/wiki) - [translating](https://www.transifex.com/projects/p/signal-android/) - finding and marking duplicate issues - trying to reproduce issues - finding solutions to open issues and posting relevant findings as comments - submitting pull requests - testing other people's pull requests -- spreading the joy of Signal to your friends and family -- donating money to our [BitHub](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b) or through the [Freedom of the Press Foundation's donation page](https://freedom.press/bundle/encryption-tools-journalists) - -[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +- spreading the joy of LibreSignal to your friends and family diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..9e99cddaadf --- /dev/null +++ b/Dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu:14.04.3 + +RUN dpkg --add-architecture i386 && \ + apt-get update -y && \ + apt-get install -y software-properties-common && \ + add-apt-repository -y ppa:openjdk-r/ppa && \ + apt-get update -y && \ + apt-get install -y libc6:i386=2.19-0ubuntu6.7 libncurses5:i386=5.9+20140118-1ubuntu1 libstdc++6:i386=4.8.4-2ubuntu1~14.04.1 lib32z1=1:1.2.8.dfsg-1ubuntu1 wget openjdk-8-jdk=8u72-b15-1~trusty1 git unzip && \ + rm -rf /var/lib/apt/lists/* && \ + apt-get autoremove -y && \ + apt-get clean + +ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz +ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME} +ENV ANDROID_API_LEVELS android-24 +ENV ANDROID_BUILD_TOOLS_VERSION 23.0.3 +ENV ANDROID_HOME /usr/local/android-sdk-linux +ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools +RUN cd /usr/local/ && \ + wget -q ${ANDROID_SDK_URL} && \ + tar -xzf ${ANDROID_SDK_FILENAME} && \ + rm ${ANDROID_SDK_FILENAME} +RUN echo y | android update sdk --no-ui -a --filter ${ANDROID_API_LEVELS} +RUN echo y | android update sdk --no-ui -a --filter extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository +RUN echo y | android update sdk --no-ui -a --filter tools,platform-tools,build-tools-${ANDROID_BUILD_TOOLS_VERSION} +RUN rm -rf ${ANDROID_HOME}/tools && unzip ${ANDROID_HOME}/temp/*.zip -d ${ANDROID_HOME} diff --git a/README.md b/README.md index c0c7f6f7b76..f8526fb5c25 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,34 @@ -# Signal Android +#The project was abandoned because of https://github.com/LibreSignal/LibreSignal/issues/37#issuecomment-217211165 -Signal is a messaging app for simple private communication with friends. +# LibreSignal for Android -Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone. +`LibreSignal` is the **Google-Free** fork of the original `Signal` messaging app for simple private communication with friends. `LibreSignal` uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone. Featured on [Kuketz IT-Security Blog](https://www.kuketz-blog.de/?s=LibreSignal). -Currently available on the Play store. - -Get it on Google Play - -#WebSocket Support# - -This branch adds rudimentary WebSocket-ONLY support to Signal Private Messenger. -In order to build a modified version of libtextsecure is needed, for that [checkout](https://github.com/JavaJens/libtextsecure-java/tree/fix/maven_local) my fork - -and run: ````./gradlew tasks installArchives```` to install in local maven directory. +# WebSocket Support +For push notifications, Google Cloud Messaging has been completely replaced by WebSocket to directly connect to Open Whisper Systems's server. +It's done via a modified version of `libtextsecure`, which has been included as a submodule. ## Contributing Bug reports -We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked! - -https://github.com/WhisperSystems/Signal-Android/issues - -## Joining the Beta -Want to live life on the bleeding edge and help out with testing? - -You can subscribe to Signal Android Beta releases here: -https://play.google.com/apps/testing/org.thoughtcrime.securesms - -If you're interested in a life of peace and tranquility, stick with the standard releases. +We use GitHub for bug tracking. Please search the [existing issues](https://github.com/LibreSignal/LibreSignal/issues) for your bug and create a new one if yours is not present. ## Contributing Translations -Interested in helping to translate Signal? Contribute here: +Interested in helping to translate LibreSignal? Contribute here: https://www.transifex.com/projects/p/signal-android/ ## Contributing Code -Instructions on how to setup your development environment and build Signal can be found in [BUILDING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/BUILDING.md). - -If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions. - -For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation. - -This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal. The current BitHub price for an accepted pull request is: - -[![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/) +Before contributing to LibreSignal, think about adding your code to [Signal-Android](https://github.com/WhisperSystems/Signal-Android/wiki), as we pull from there. Instructions on how to setup your development environment and build LibreSignal can be found in [BUILDING.md](https://github.com/LibreSignal/LibreSignal/blob/master/BUILDING.md). If you're new to the LibreSignal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/LibreSignal/LibreSignal/blob/master/CONTRIBUTING.md), that might answer some questions. ## Contributing Ideas -Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://whispersystems.discoursehosting.net). - -## Contributing Funds -[![Donate](https://cloud.githubusercontent.com/assets/3121306/11278543/d46e03d0-8eeb-11e5-9691-0da1bf643192.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b) - -You can add funds to BitHub to directly help further development efforts. +Have something you want to say about LibreSignal or want to be part of the conversation? Feel invited to [post your new idea](https://github.com/LibreSignal/LibreSignal/issues/new), but please be patient for a reply and don't be mad should developers decide to not implement it or are busy with other things. Help ==== ## Support -For troubleshooting and questions, please visit our support center! - -http://support.whispersystems.org/ +For troubleshooting and questions, please read our [FAQ](https://github.com/LibreSignal/LibreSignal/wiki/FAQ) and see our [GitHub Issues](https://github.com/LibreSignal/LibreSignal/issues)! ## Documentation -Looking for documentation? Check out the wiki! - -https://github.com/WhisperSystems/Signal-Android/wiki +Looking for documentation? Check out the [original Signal wiki](https://github.com/WhisperSystems/Signal-Android/wiki). # Legal things ## Cryptography Notice @@ -76,8 +42,4 @@ The form and manner of this distribution makes it eligible for export under the ## License -Copyright 2011 Whisper Systems - -Copyright 2013-2016 Open Whisper Systems - Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html diff --git a/apkdiff/apkdiff.py b/apkdiff/apkdiff.py new file mode 100755 index 00000000000..4dbb253994b --- /dev/null +++ b/apkdiff/apkdiff.py @@ -0,0 +1,78 @@ +#! /usr/bin/env python + +import sys +from zipfile import ZipFile + +class ApkDiff: + + IGNORE_FILES = ["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"] + + def compare(self, sourceApk, destinationApk): + sourceZip = ZipFile(sourceApk, 'r') + destinationZip = ZipFile(destinationApk, 'r') + + if self.compareManifests(sourceZip, destinationZip) and self.compareEntries(sourceZip, destinationZip) == True: + print "APKs match!" + else: + print "APKs don't match!" + + def compareManifests(self, sourceZip, destinationZip): + sourceEntrySortedList = sorted(sourceZip.namelist()) + destinationEntrySortedList = sorted(destinationZip.namelist()) + + for ignoreFile in self.IGNORE_FILES: + while ignoreFile in sourceEntrySortedList: sourceEntrySortedList.remove(ignoreFile) + while ignoreFile in destinationEntrySortedList: destinationEntrySortedList.remove(ignoreFile) + + if len(sourceEntrySortedList) != len(destinationEntrySortedList): + print "Manifest lengths differ!" + + for (sourceEntryName, destinationEntryName) in zip(sourceEntrySortedList, destinationEntrySortedList): + if sourceEntryName != destinationEntryName: + print "Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName) + return False + + return True + + def compareEntries(self, sourceZip, destinationZip): + sourceInfoList = filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist()) + destinationInfoList = filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist()) + + if len(sourceInfoList) != len(destinationInfoList): + print "APK info lists of different length!" + return False + + for sourceEntryInfo in sourceInfoList: + for destinationEntryInfo in list(destinationInfoList): + if sourceEntryInfo.filename == destinationEntryInfo.filename: + sourceEntry = sourceZip.open(sourceEntryInfo, 'r') + destinationEntry = destinationZip.open(destinationEntryInfo, 'r') + + if self.compareFiles(sourceEntry, destinationEntry) != True: + print "APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename) + return False + + destinationInfoList.remove(destinationEntryInfo) + break + + return True + + def compareFiles(self, sourceFile, destinationFile): + sourceChunk = sourceFile.read(1024) + destinationChunk = destinationFile.read(1024) + + while sourceChunk != "" or destinationChunk != "": + if sourceChunk != destinationChunk: + return False + + sourceChunk = sourceFile.read(1024) + destinationChunk = destinationFile.read(1024) + + return True + +if __name__ == '__main__': + if len(sys.argv) != 3: + print "Usage: apkdiff " + sys.exit(1) + + ApkDiff().compare(sys.argv[1], sys.argv[2]) diff --git a/assets/emoji-nature.png b/assets/emoji-nature.png deleted file mode 100644 index 695e8e99711..00000000000 Binary files a/assets/emoji-nature.png and /dev/null differ diff --git a/assets/emoji-objects.png b/assets/emoji-objects.png deleted file mode 100644 index b3b1fe5e206..00000000000 Binary files a/assets/emoji-objects.png and /dev/null differ diff --git a/assets/emoji-people.png b/assets/emoji-people.png deleted file mode 100644 index 7239a83347e..00000000000 Binary files a/assets/emoji-people.png and /dev/null differ diff --git a/assets/emoji-places.png b/assets/emoji-places.png deleted file mode 100644 index b1dd5365c40..00000000000 Binary files a/assets/emoji-places.png and /dev/null differ diff --git a/assets/emoji-symbol.png b/assets/emoji-symbol.png deleted file mode 100644 index 4d9b917afc8..00000000000 Binary files a/assets/emoji-symbol.png and /dev/null differ diff --git a/assets/emoji/Activity.png b/assets/emoji/Activity.png new file mode 100644 index 00000000000..2558066d250 Binary files /dev/null and b/assets/emoji/Activity.png differ diff --git a/assets/emoji/Flags.png b/assets/emoji/Flags.png new file mode 100644 index 00000000000..a8814899b7d Binary files /dev/null and b/assets/emoji/Flags.png differ diff --git a/assets/emoji/Foods.png b/assets/emoji/Foods.png new file mode 100644 index 00000000000..18961ecbd48 Binary files /dev/null and b/assets/emoji/Foods.png differ diff --git a/assets/emoji/Nature.png b/assets/emoji/Nature.png new file mode 100644 index 00000000000..6e42b042776 Binary files /dev/null and b/assets/emoji/Nature.png differ diff --git a/assets/emoji/Objects.png b/assets/emoji/Objects.png new file mode 100644 index 00000000000..c6fac145f90 Binary files /dev/null and b/assets/emoji/Objects.png differ diff --git a/assets/emoji/People.png b/assets/emoji/People.png new file mode 100644 index 00000000000..e8587df305b Binary files /dev/null and b/assets/emoji/People.png differ diff --git a/assets/emoji/Places.png b/assets/emoji/Places.png new file mode 100644 index 00000000000..ae0a72ee464 Binary files /dev/null and b/assets/emoji/Places.png differ diff --git a/assets/emoji/Symbols.png b/assets/emoji/Symbols.png new file mode 100644 index 00000000000..786d2d55202 Binary files /dev/null and b/assets/emoji/Symbols.png differ diff --git a/assets/stickers/animals/anteater.png b/assets/stickers/animals/anteater.png new file mode 100644 index 00000000000..ca798a852fd Binary files /dev/null and b/assets/stickers/animals/anteater.png differ diff --git a/assets/stickers/animals/bat.png b/assets/stickers/animals/bat.png new file mode 100644 index 00000000000..27a586a8476 Binary files /dev/null and b/assets/stickers/animals/bat.png differ diff --git a/assets/stickers/animals/beetle.png b/assets/stickers/animals/beetle.png new file mode 100644 index 00000000000..ee58fb14f92 Binary files /dev/null and b/assets/stickers/animals/beetle.png differ diff --git a/assets/stickers/animals/bulldog.png b/assets/stickers/animals/bulldog.png new file mode 100644 index 00000000000..b9fc34307d6 Binary files /dev/null and b/assets/stickers/animals/bulldog.png differ diff --git a/assets/stickers/animals/butterfly.png b/assets/stickers/animals/butterfly.png new file mode 100644 index 00000000000..467927a2338 Binary files /dev/null and b/assets/stickers/animals/butterfly.png differ diff --git a/assets/stickers/animals/camel.png b/assets/stickers/animals/camel.png new file mode 100644 index 00000000000..1026c7044b4 Binary files /dev/null and b/assets/stickers/animals/camel.png differ diff --git a/assets/stickers/animals/cat.png b/assets/stickers/animals/cat.png new file mode 100644 index 00000000000..a2777120822 Binary files /dev/null and b/assets/stickers/animals/cat.png differ diff --git a/assets/stickers/animals/chameleon.png b/assets/stickers/animals/chameleon.png new file mode 100644 index 00000000000..45a16a389ee Binary files /dev/null and b/assets/stickers/animals/chameleon.png differ diff --git a/assets/stickers/animals/clown-fish.png b/assets/stickers/animals/clown-fish.png new file mode 100644 index 00000000000..836a7a72603 Binary files /dev/null and b/assets/stickers/animals/clown-fish.png differ diff --git a/assets/stickers/animals/cobra.png b/assets/stickers/animals/cobra.png new file mode 100644 index 00000000000..56f54d0e4fa Binary files /dev/null and b/assets/stickers/animals/cobra.png differ diff --git a/assets/stickers/animals/cow.png b/assets/stickers/animals/cow.png new file mode 100644 index 00000000000..dbb128df8e1 Binary files /dev/null and b/assets/stickers/animals/cow.png differ diff --git a/assets/stickers/animals/crab.png b/assets/stickers/animals/crab.png new file mode 100644 index 00000000000..d9b69dc6de3 Binary files /dev/null and b/assets/stickers/animals/crab.png differ diff --git a/assets/stickers/animals/crocodile.png b/assets/stickers/animals/crocodile.png new file mode 100644 index 00000000000..ad9f2f8b0fe Binary files /dev/null and b/assets/stickers/animals/crocodile.png differ diff --git a/assets/stickers/animals/duck.png b/assets/stickers/animals/duck.png new file mode 100644 index 00000000000..ad987a53c1d Binary files /dev/null and b/assets/stickers/animals/duck.png differ diff --git a/assets/stickers/animals/elephant.png b/assets/stickers/animals/elephant.png new file mode 100644 index 00000000000..38e9fd23684 Binary files /dev/null and b/assets/stickers/animals/elephant.png differ diff --git a/assets/stickers/animals/frog.png b/assets/stickers/animals/frog.png new file mode 100644 index 00000000000..f9631266e88 Binary files /dev/null and b/assets/stickers/animals/frog.png differ diff --git a/assets/stickers/animals/giraffe.png b/assets/stickers/animals/giraffe.png new file mode 100644 index 00000000000..9b183015451 Binary files /dev/null and b/assets/stickers/animals/giraffe.png differ diff --git a/assets/stickers/animals/hen.png b/assets/stickers/animals/hen.png new file mode 100644 index 00000000000..f875bb1bf35 Binary files /dev/null and b/assets/stickers/animals/hen.png differ diff --git a/assets/stickers/animals/hippopotamus.png b/assets/stickers/animals/hippopotamus.png new file mode 100644 index 00000000000..04782f93621 Binary files /dev/null and b/assets/stickers/animals/hippopotamus.png differ diff --git a/assets/stickers/animals/kangaroo.png b/assets/stickers/animals/kangaroo.png new file mode 100644 index 00000000000..b9c60b1ce63 Binary files /dev/null and b/assets/stickers/animals/kangaroo.png differ diff --git a/assets/stickers/animals/lion.png b/assets/stickers/animals/lion.png new file mode 100644 index 00000000000..0c73c676a9d Binary files /dev/null and b/assets/stickers/animals/lion.png differ diff --git a/assets/stickers/animals/llama.png b/assets/stickers/animals/llama.png new file mode 100644 index 00000000000..43945dc3d1d Binary files /dev/null and b/assets/stickers/animals/llama.png differ diff --git a/assets/stickers/animals/macaw.png b/assets/stickers/animals/macaw.png new file mode 100644 index 00000000000..4c7c10668d1 Binary files /dev/null and b/assets/stickers/animals/macaw.png differ diff --git a/assets/stickers/animals/monkey.png b/assets/stickers/animals/monkey.png new file mode 100644 index 00000000000..50248cd7f90 Binary files /dev/null and b/assets/stickers/animals/monkey.png differ diff --git a/assets/stickers/animals/moose.png b/assets/stickers/animals/moose.png new file mode 100644 index 00000000000..29f8fe5cd54 Binary files /dev/null and b/assets/stickers/animals/moose.png differ diff --git a/assets/stickers/animals/mouse.png b/assets/stickers/animals/mouse.png new file mode 100644 index 00000000000..c15080a4434 Binary files /dev/null and b/assets/stickers/animals/mouse.png differ diff --git a/assets/stickers/animals/octopus.png b/assets/stickers/animals/octopus.png new file mode 100644 index 00000000000..0aa5c457c36 Binary files /dev/null and b/assets/stickers/animals/octopus.png differ diff --git a/assets/stickers/animals/ostrich.png b/assets/stickers/animals/ostrich.png new file mode 100644 index 00000000000..f9fd66c2c3b Binary files /dev/null and b/assets/stickers/animals/ostrich.png differ diff --git a/assets/stickers/animals/owl.png b/assets/stickers/animals/owl.png new file mode 100644 index 00000000000..bcaf9a6a96b Binary files /dev/null and b/assets/stickers/animals/owl.png differ diff --git a/assets/stickers/animals/panda.png b/assets/stickers/animals/panda.png new file mode 100644 index 00000000000..80ad77836bd Binary files /dev/null and b/assets/stickers/animals/panda.png differ diff --git a/assets/stickers/animals/pelican.png b/assets/stickers/animals/pelican.png new file mode 100644 index 00000000000..b04d90cda3b Binary files /dev/null and b/assets/stickers/animals/pelican.png differ diff --git a/assets/stickers/animals/penguin.png b/assets/stickers/animals/penguin.png new file mode 100644 index 00000000000..7a730d11192 Binary files /dev/null and b/assets/stickers/animals/penguin.png differ diff --git a/assets/stickers/animals/pig.png b/assets/stickers/animals/pig.png new file mode 100644 index 00000000000..181da2e2d6b Binary files /dev/null and b/assets/stickers/animals/pig.png differ diff --git a/assets/stickers/animals/rabbit.png b/assets/stickers/animals/rabbit.png new file mode 100644 index 00000000000..7c45ebdd038 Binary files /dev/null and b/assets/stickers/animals/rabbit.png differ diff --git a/assets/stickers/animals/racoon.png b/assets/stickers/animals/racoon.png new file mode 100644 index 00000000000..80183ce2687 Binary files /dev/null and b/assets/stickers/animals/racoon.png differ diff --git a/assets/stickers/animals/ray.png b/assets/stickers/animals/ray.png new file mode 100644 index 00000000000..3f280ab231f Binary files /dev/null and b/assets/stickers/animals/ray.png differ diff --git a/assets/stickers/animals/rhinoceros.png b/assets/stickers/animals/rhinoceros.png new file mode 100644 index 00000000000..bee18d6a23a Binary files /dev/null and b/assets/stickers/animals/rhinoceros.png differ diff --git a/assets/stickers/animals/sea-cow.png b/assets/stickers/animals/sea-cow.png new file mode 100644 index 00000000000..ad0c4ff109e Binary files /dev/null and b/assets/stickers/animals/sea-cow.png differ diff --git a/assets/stickers/animals/shark.png b/assets/stickers/animals/shark.png new file mode 100644 index 00000000000..db300fbaae0 Binary files /dev/null and b/assets/stickers/animals/shark.png differ diff --git a/assets/stickers/animals/sheep.png b/assets/stickers/animals/sheep.png new file mode 100644 index 00000000000..2799792d891 Binary files /dev/null and b/assets/stickers/animals/sheep.png differ diff --git a/assets/stickers/animals/siberian-husky.png b/assets/stickers/animals/siberian-husky.png new file mode 100644 index 00000000000..21e619bca43 Binary files /dev/null and b/assets/stickers/animals/siberian-husky.png differ diff --git a/assets/stickers/animals/sloth.png b/assets/stickers/animals/sloth.png new file mode 100644 index 00000000000..b22f3c73831 Binary files /dev/null and b/assets/stickers/animals/sloth.png differ diff --git a/assets/stickers/animals/snake.png b/assets/stickers/animals/snake.png new file mode 100644 index 00000000000..ab2bffafa21 Binary files /dev/null and b/assets/stickers/animals/snake.png differ diff --git a/assets/stickers/animals/spider.png b/assets/stickers/animals/spider.png new file mode 100644 index 00000000000..36843a66668 Binary files /dev/null and b/assets/stickers/animals/spider.png differ diff --git a/assets/stickers/animals/squirrel.png b/assets/stickers/animals/squirrel.png new file mode 100644 index 00000000000..bd75170e22d Binary files /dev/null and b/assets/stickers/animals/squirrel.png differ diff --git a/assets/stickers/animals/swan.png b/assets/stickers/animals/swan.png new file mode 100644 index 00000000000..832449151f0 Binary files /dev/null and b/assets/stickers/animals/swan.png differ diff --git a/assets/stickers/animals/tiger.png b/assets/stickers/animals/tiger.png new file mode 100644 index 00000000000..0ff4f9c8943 Binary files /dev/null and b/assets/stickers/animals/tiger.png differ diff --git a/assets/stickers/animals/toucan.png b/assets/stickers/animals/toucan.png new file mode 100644 index 00000000000..0c4986722fa Binary files /dev/null and b/assets/stickers/animals/toucan.png differ diff --git a/assets/stickers/animals/turtle.png b/assets/stickers/animals/turtle.png new file mode 100644 index 00000000000..cca4b7d1384 Binary files /dev/null and b/assets/stickers/animals/turtle.png differ diff --git a/assets/stickers/animals/whale.png b/assets/stickers/animals/whale.png new file mode 100644 index 00000000000..ff0c3227cbb Binary files /dev/null and b/assets/stickers/animals/whale.png differ diff --git a/assets/stickers/clothes/backpack.png b/assets/stickers/clothes/backpack.png new file mode 100644 index 00000000000..da551cc24f4 Binary files /dev/null and b/assets/stickers/clothes/backpack.png differ diff --git a/assets/stickers/clothes/bathrobe.png b/assets/stickers/clothes/bathrobe.png new file mode 100644 index 00000000000..c0ed9a76caa Binary files /dev/null and b/assets/stickers/clothes/bathrobe.png differ diff --git a/assets/stickers/clothes/belt.png b/assets/stickers/clothes/belt.png new file mode 100644 index 00000000000..0c8724a113f Binary files /dev/null and b/assets/stickers/clothes/belt.png differ diff --git a/assets/stickers/clothes/boot.png b/assets/stickers/clothes/boot.png new file mode 100644 index 00000000000..2bbc116e627 Binary files /dev/null and b/assets/stickers/clothes/boot.png differ diff --git a/assets/stickers/clothes/bow-tie.png b/assets/stickers/clothes/bow-tie.png new file mode 100644 index 00000000000..5cb39bf95ed Binary files /dev/null and b/assets/stickers/clothes/bow-tie.png differ diff --git a/assets/stickers/clothes/bowler-hat.png b/assets/stickers/clothes/bowler-hat.png new file mode 100644 index 00000000000..05f9675f560 Binary files /dev/null and b/assets/stickers/clothes/bowler-hat.png differ diff --git a/assets/stickers/clothes/boxers.png b/assets/stickers/clothes/boxers.png new file mode 100644 index 00000000000..38eba6fbf2c Binary files /dev/null and b/assets/stickers/clothes/boxers.png differ diff --git a/assets/stickers/clothes/bra.png b/assets/stickers/clothes/bra.png new file mode 100644 index 00000000000..6e98519f600 Binary files /dev/null and b/assets/stickers/clothes/bra.png differ diff --git a/assets/stickers/clothes/cap.png b/assets/stickers/clothes/cap.png new file mode 100644 index 00000000000..c1abd23ed6c Binary files /dev/null and b/assets/stickers/clothes/cap.png differ diff --git a/assets/stickers/clothes/dress-1.png b/assets/stickers/clothes/dress-1.png new file mode 100644 index 00000000000..67e961b94f2 Binary files /dev/null and b/assets/stickers/clothes/dress-1.png differ diff --git a/assets/stickers/clothes/dress-2.png b/assets/stickers/clothes/dress-2.png new file mode 100644 index 00000000000..af94d5f40c1 Binary files /dev/null and b/assets/stickers/clothes/dress-2.png differ diff --git a/assets/stickers/clothes/dress-3.png b/assets/stickers/clothes/dress-3.png new file mode 100644 index 00000000000..74ff0cb9a56 Binary files /dev/null and b/assets/stickers/clothes/dress-3.png differ diff --git a/assets/stickers/clothes/dress.png b/assets/stickers/clothes/dress.png new file mode 100644 index 00000000000..73a85cc10a2 Binary files /dev/null and b/assets/stickers/clothes/dress.png differ diff --git a/assets/stickers/clothes/glasses.png b/assets/stickers/clothes/glasses.png new file mode 100644 index 00000000000..5de0e5bf1d7 Binary files /dev/null and b/assets/stickers/clothes/glasses.png differ diff --git a/assets/stickers/clothes/hat.png b/assets/stickers/clothes/hat.png new file mode 100644 index 00000000000..f383ab14298 Binary files /dev/null and b/assets/stickers/clothes/hat.png differ diff --git a/assets/stickers/clothes/high-heel.png b/assets/stickers/clothes/high-heel.png new file mode 100644 index 00000000000..b488e7cc1a6 Binary files /dev/null and b/assets/stickers/clothes/high-heel.png differ diff --git a/assets/stickers/clothes/jacket-1.png b/assets/stickers/clothes/jacket-1.png new file mode 100644 index 00000000000..0d18f1b9921 Binary files /dev/null and b/assets/stickers/clothes/jacket-1.png differ diff --git a/assets/stickers/clothes/jacket-2.png b/assets/stickers/clothes/jacket-2.png new file mode 100644 index 00000000000..7b87ef8b1fa Binary files /dev/null and b/assets/stickers/clothes/jacket-2.png differ diff --git a/assets/stickers/clothes/jacket-3.png b/assets/stickers/clothes/jacket-3.png new file mode 100644 index 00000000000..fc9229ab47b Binary files /dev/null and b/assets/stickers/clothes/jacket-3.png differ diff --git a/assets/stickers/clothes/jacket-4.png b/assets/stickers/clothes/jacket-4.png new file mode 100644 index 00000000000..fd8fa1df1f8 Binary files /dev/null and b/assets/stickers/clothes/jacket-4.png differ diff --git a/assets/stickers/clothes/jacket.png b/assets/stickers/clothes/jacket.png new file mode 100644 index 00000000000..952e1cc03eb Binary files /dev/null and b/assets/stickers/clothes/jacket.png differ diff --git a/assets/stickers/clothes/jeans.png b/assets/stickers/clothes/jeans.png new file mode 100644 index 00000000000..f6dc108d2c5 Binary files /dev/null and b/assets/stickers/clothes/jeans.png differ diff --git a/assets/stickers/clothes/lingerie.png b/assets/stickers/clothes/lingerie.png new file mode 100644 index 00000000000..5c569eeaec6 Binary files /dev/null and b/assets/stickers/clothes/lingerie.png differ diff --git a/assets/stickers/clothes/overall.png b/assets/stickers/clothes/overall.png new file mode 100644 index 00000000000..50afb351082 Binary files /dev/null and b/assets/stickers/clothes/overall.png differ diff --git a/assets/stickers/clothes/polo.png b/assets/stickers/clothes/polo.png new file mode 100644 index 00000000000..d61d39c05cd Binary files /dev/null and b/assets/stickers/clothes/polo.png differ diff --git a/assets/stickers/clothes/pullover.png b/assets/stickers/clothes/pullover.png new file mode 100644 index 00000000000..fa0763bde85 Binary files /dev/null and b/assets/stickers/clothes/pullover.png differ diff --git a/assets/stickers/clothes/purse-1.png b/assets/stickers/clothes/purse-1.png new file mode 100644 index 00000000000..f0c8e715836 Binary files /dev/null and b/assets/stickers/clothes/purse-1.png differ diff --git a/assets/stickers/clothes/purse.png b/assets/stickers/clothes/purse.png new file mode 100644 index 00000000000..1e80ded3d6e Binary files /dev/null and b/assets/stickers/clothes/purse.png differ diff --git a/assets/stickers/clothes/scarf.png b/assets/stickers/clothes/scarf.png new file mode 100644 index 00000000000..6502e06b670 Binary files /dev/null and b/assets/stickers/clothes/scarf.png differ diff --git a/assets/stickers/clothes/shirt-1.png b/assets/stickers/clothes/shirt-1.png new file mode 100644 index 00000000000..a161e734910 Binary files /dev/null and b/assets/stickers/clothes/shirt-1.png differ diff --git a/assets/stickers/clothes/shirt-2.png b/assets/stickers/clothes/shirt-2.png new file mode 100644 index 00000000000..ee7761926d1 Binary files /dev/null and b/assets/stickers/clothes/shirt-2.png differ diff --git a/assets/stickers/clothes/shirt.png b/assets/stickers/clothes/shirt.png new file mode 100644 index 00000000000..834d74ccbf9 Binary files /dev/null and b/assets/stickers/clothes/shirt.png differ diff --git a/assets/stickers/clothes/shoe.png b/assets/stickers/clothes/shoe.png new file mode 100644 index 00000000000..e2470e3573b Binary files /dev/null and b/assets/stickers/clothes/shoe.png differ diff --git a/assets/stickers/clothes/shorts.png b/assets/stickers/clothes/shorts.png new file mode 100644 index 00000000000..a28db713234 Binary files /dev/null and b/assets/stickers/clothes/shorts.png differ diff --git a/assets/stickers/clothes/skirt.png b/assets/stickers/clothes/skirt.png new file mode 100644 index 00000000000..f584573b752 Binary files /dev/null and b/assets/stickers/clothes/skirt.png differ diff --git a/assets/stickers/clothes/sleeveless.png b/assets/stickers/clothes/sleeveless.png new file mode 100644 index 00000000000..c7f8eed064f Binary files /dev/null and b/assets/stickers/clothes/sleeveless.png differ diff --git a/assets/stickers/clothes/slippers.png b/assets/stickers/clothes/slippers.png new file mode 100644 index 00000000000..d1856025b93 Binary files /dev/null and b/assets/stickers/clothes/slippers.png differ diff --git a/assets/stickers/clothes/sneakers-1.png b/assets/stickers/clothes/sneakers-1.png new file mode 100644 index 00000000000..aec9611d099 Binary files /dev/null and b/assets/stickers/clothes/sneakers-1.png differ diff --git a/assets/stickers/clothes/sneakers.png b/assets/stickers/clothes/sneakers.png new file mode 100644 index 00000000000..7819f1015d2 Binary files /dev/null and b/assets/stickers/clothes/sneakers.png differ diff --git a/assets/stickers/clothes/socks.png b/assets/stickers/clothes/socks.png new file mode 100644 index 00000000000..115efb4dac7 Binary files /dev/null and b/assets/stickers/clothes/socks.png differ diff --git a/assets/stickers/clothes/suitcase.png b/assets/stickers/clothes/suitcase.png new file mode 100644 index 00000000000..22f1ec57ed9 Binary files /dev/null and b/assets/stickers/clothes/suitcase.png differ diff --git a/assets/stickers/clothes/sweatshirt.png b/assets/stickers/clothes/sweatshirt.png new file mode 100644 index 00000000000..1f0d71816cb Binary files /dev/null and b/assets/stickers/clothes/sweatshirt.png differ diff --git a/assets/stickers/clothes/swimsuit-1.png b/assets/stickers/clothes/swimsuit-1.png new file mode 100644 index 00000000000..3ca05d0329e Binary files /dev/null and b/assets/stickers/clothes/swimsuit-1.png differ diff --git a/assets/stickers/clothes/swimsuit.png b/assets/stickers/clothes/swimsuit.png new file mode 100644 index 00000000000..e0b3207dc6f Binary files /dev/null and b/assets/stickers/clothes/swimsuit.png differ diff --git a/assets/stickers/clothes/tie.png b/assets/stickers/clothes/tie.png new file mode 100644 index 00000000000..a881563c8f8 Binary files /dev/null and b/assets/stickers/clothes/tie.png differ diff --git a/assets/stickers/clothes/trench-coat.png b/assets/stickers/clothes/trench-coat.png new file mode 100644 index 00000000000..9d5a92b0ecd Binary files /dev/null and b/assets/stickers/clothes/trench-coat.png differ diff --git a/assets/stickers/clothes/trousers.png b/assets/stickers/clothes/trousers.png new file mode 100644 index 00000000000..53e9d478849 Binary files /dev/null and b/assets/stickers/clothes/trousers.png differ diff --git a/assets/stickers/clothes/underpants.png b/assets/stickers/clothes/underpants.png new file mode 100644 index 00000000000..e381a692a07 Binary files /dev/null and b/assets/stickers/clothes/underpants.png differ diff --git a/assets/stickers/clothes/vest.png b/assets/stickers/clothes/vest.png new file mode 100644 index 00000000000..2a55a3dd0b7 Binary files /dev/null and b/assets/stickers/clothes/vest.png differ diff --git a/assets/stickers/clothes/winter-hat.png b/assets/stickers/clothes/winter-hat.png new file mode 100644 index 00000000000..202a4383c07 Binary files /dev/null and b/assets/stickers/clothes/winter-hat.png differ diff --git a/assets/stickers/emoticons/angry-1.png b/assets/stickers/emoticons/angry-1.png new file mode 100644 index 00000000000..a881db9bee1 Binary files /dev/null and b/assets/stickers/emoticons/angry-1.png differ diff --git a/assets/stickers/emoticons/angry.png b/assets/stickers/emoticons/angry.png new file mode 100644 index 00000000000..d78a86d3bc2 Binary files /dev/null and b/assets/stickers/emoticons/angry.png differ diff --git a/assets/stickers/emoticons/bored-1.png b/assets/stickers/emoticons/bored-1.png new file mode 100644 index 00000000000..7655c2ba67e Binary files /dev/null and b/assets/stickers/emoticons/bored-1.png differ diff --git a/assets/stickers/emoticons/bored-2.png b/assets/stickers/emoticons/bored-2.png new file mode 100644 index 00000000000..cbd57695679 Binary files /dev/null and b/assets/stickers/emoticons/bored-2.png differ diff --git a/assets/stickers/emoticons/bored.png b/assets/stickers/emoticons/bored.png new file mode 100644 index 00000000000..1e56e6ba2ed Binary files /dev/null and b/assets/stickers/emoticons/bored.png differ diff --git a/assets/stickers/emoticons/confused-1.png b/assets/stickers/emoticons/confused-1.png new file mode 100644 index 00000000000..5f81f7e8eb3 Binary files /dev/null and b/assets/stickers/emoticons/confused-1.png differ diff --git a/assets/stickers/emoticons/confused.png b/assets/stickers/emoticons/confused.png new file mode 100644 index 00000000000..2306f5c406a Binary files /dev/null and b/assets/stickers/emoticons/confused.png differ diff --git a/assets/stickers/emoticons/crying-1.png b/assets/stickers/emoticons/crying-1.png new file mode 100644 index 00000000000..b63927db8c9 Binary files /dev/null and b/assets/stickers/emoticons/crying-1.png differ diff --git a/assets/stickers/emoticons/crying.png b/assets/stickers/emoticons/crying.png new file mode 100644 index 00000000000..f8af6376102 Binary files /dev/null and b/assets/stickers/emoticons/crying.png differ diff --git a/assets/stickers/emoticons/embarrassed.png b/assets/stickers/emoticons/embarrassed.png new file mode 100644 index 00000000000..32333eb8f8c Binary files /dev/null and b/assets/stickers/emoticons/embarrassed.png differ diff --git a/assets/stickers/emoticons/emoticons.png b/assets/stickers/emoticons/emoticons.png new file mode 100644 index 00000000000..c40f0b8a370 Binary files /dev/null and b/assets/stickers/emoticons/emoticons.png differ diff --git a/assets/stickers/emoticons/happy-1.png b/assets/stickers/emoticons/happy-1.png new file mode 100644 index 00000000000..32bedb03234 Binary files /dev/null and b/assets/stickers/emoticons/happy-1.png differ diff --git a/assets/stickers/emoticons/happy-2.png b/assets/stickers/emoticons/happy-2.png new file mode 100644 index 00000000000..5dafe9271fc Binary files /dev/null and b/assets/stickers/emoticons/happy-2.png differ diff --git a/assets/stickers/emoticons/happy-3.png b/assets/stickers/emoticons/happy-3.png new file mode 100644 index 00000000000..65ef3d3cffa Binary files /dev/null and b/assets/stickers/emoticons/happy-3.png differ diff --git a/assets/stickers/emoticons/happy-4.png b/assets/stickers/emoticons/happy-4.png new file mode 100644 index 00000000000..35f14c9a7d3 Binary files /dev/null and b/assets/stickers/emoticons/happy-4.png differ diff --git a/assets/stickers/emoticons/happy.png b/assets/stickers/emoticons/happy.png new file mode 100644 index 00000000000..090fe168097 Binary files /dev/null and b/assets/stickers/emoticons/happy.png differ diff --git a/assets/stickers/emoticons/ill.png b/assets/stickers/emoticons/ill.png new file mode 100644 index 00000000000..9c12470350f Binary files /dev/null and b/assets/stickers/emoticons/ill.png differ diff --git a/assets/stickers/emoticons/in-love.png b/assets/stickers/emoticons/in-love.png new file mode 100644 index 00000000000..256a8fbc138 Binary files /dev/null and b/assets/stickers/emoticons/in-love.png differ diff --git a/assets/stickers/emoticons/kissing.png b/assets/stickers/emoticons/kissing.png new file mode 100644 index 00000000000..2b2f7da188b Binary files /dev/null and b/assets/stickers/emoticons/kissing.png differ diff --git a/assets/stickers/emoticons/mad.png b/assets/stickers/emoticons/mad.png new file mode 100644 index 00000000000..cb0dcaa7fd8 Binary files /dev/null and b/assets/stickers/emoticons/mad.png differ diff --git a/assets/stickers/emoticons/nerd.png b/assets/stickers/emoticons/nerd.png new file mode 100644 index 00000000000..1a9f8fcbb78 Binary files /dev/null and b/assets/stickers/emoticons/nerd.png differ diff --git a/assets/stickers/emoticons/ninja.png b/assets/stickers/emoticons/ninja.png new file mode 100644 index 00000000000..d9ce9b8c698 Binary files /dev/null and b/assets/stickers/emoticons/ninja.png differ diff --git a/assets/stickers/emoticons/quiet.png b/assets/stickers/emoticons/quiet.png new file mode 100644 index 00000000000..7de2ea4f9d5 Binary files /dev/null and b/assets/stickers/emoticons/quiet.png differ diff --git a/assets/stickers/emoticons/sad.png b/assets/stickers/emoticons/sad.png new file mode 100644 index 00000000000..af670a5df47 Binary files /dev/null and b/assets/stickers/emoticons/sad.png differ diff --git a/assets/stickers/emoticons/secret.png b/assets/stickers/emoticons/secret.png new file mode 100644 index 00000000000..60713557443 Binary files /dev/null and b/assets/stickers/emoticons/secret.png differ diff --git a/assets/stickers/emoticons/smart.png b/assets/stickers/emoticons/smart.png new file mode 100644 index 00000000000..e607932aac8 Binary files /dev/null and b/assets/stickers/emoticons/smart.png differ diff --git a/assets/stickers/emoticons/smile.png b/assets/stickers/emoticons/smile.png new file mode 100644 index 00000000000..7deeb0c2487 Binary files /dev/null and b/assets/stickers/emoticons/smile.png differ diff --git a/assets/stickers/emoticons/smiling.png b/assets/stickers/emoticons/smiling.png new file mode 100644 index 00000000000..0d3e4138096 Binary files /dev/null and b/assets/stickers/emoticons/smiling.png differ diff --git a/assets/stickers/emoticons/surprised-1.png b/assets/stickers/emoticons/surprised-1.png new file mode 100644 index 00000000000..1b8da1e3581 Binary files /dev/null and b/assets/stickers/emoticons/surprised-1.png differ diff --git a/assets/stickers/emoticons/surprised.png b/assets/stickers/emoticons/surprised.png new file mode 100644 index 00000000000..554201279f2 Binary files /dev/null and b/assets/stickers/emoticons/surprised.png differ diff --git a/assets/stickers/emoticons/suspicious-1.png b/assets/stickers/emoticons/suspicious-1.png new file mode 100644 index 00000000000..d9b4aab2631 Binary files /dev/null and b/assets/stickers/emoticons/suspicious-1.png differ diff --git a/assets/stickers/emoticons/suspicious.png b/assets/stickers/emoticons/suspicious.png new file mode 100644 index 00000000000..3d33e5bc2b9 Binary files /dev/null and b/assets/stickers/emoticons/suspicious.png differ diff --git a/assets/stickers/emoticons/tongue-out-1.png b/assets/stickers/emoticons/tongue-out-1.png new file mode 100644 index 00000000000..98341abad89 Binary files /dev/null and b/assets/stickers/emoticons/tongue-out-1.png differ diff --git a/assets/stickers/emoticons/tongue-out.png b/assets/stickers/emoticons/tongue-out.png new file mode 100644 index 00000000000..62616f0e406 Binary files /dev/null and b/assets/stickers/emoticons/tongue-out.png differ diff --git a/assets/stickers/emoticons/unhappy.png b/assets/stickers/emoticons/unhappy.png new file mode 100644 index 00000000000..29e0b19d676 Binary files /dev/null and b/assets/stickers/emoticons/unhappy.png differ diff --git a/assets/stickers/emoticons/wink.png b/assets/stickers/emoticons/wink.png new file mode 100644 index 00000000000..9902bd8e8ea Binary files /dev/null and b/assets/stickers/emoticons/wink.png differ diff --git a/assets/stickers/food/apple.png b/assets/stickers/food/apple.png new file mode 100644 index 00000000000..c0c87ad7a39 Binary files /dev/null and b/assets/stickers/food/apple.png differ diff --git a/assets/stickers/food/artichoke.png b/assets/stickers/food/artichoke.png new file mode 100644 index 00000000000..618b2d57447 Binary files /dev/null and b/assets/stickers/food/artichoke.png differ diff --git a/assets/stickers/food/aubergine.png b/assets/stickers/food/aubergine.png new file mode 100644 index 00000000000..0c89cbe2687 Binary files /dev/null and b/assets/stickers/food/aubergine.png differ diff --git a/assets/stickers/food/avocado.png b/assets/stickers/food/avocado.png new file mode 100644 index 00000000000..8183cfdf2c6 Binary files /dev/null and b/assets/stickers/food/avocado.png differ diff --git a/assets/stickers/food/bacon.png b/assets/stickers/food/bacon.png new file mode 100644 index 00000000000..b727419969d Binary files /dev/null and b/assets/stickers/food/bacon.png differ diff --git a/assets/stickers/food/banana.png b/assets/stickers/food/banana.png new file mode 100644 index 00000000000..78e87340c3f Binary files /dev/null and b/assets/stickers/food/banana.png differ diff --git a/assets/stickers/food/beans.png b/assets/stickers/food/beans.png new file mode 100644 index 00000000000..7cfd0ef42ca Binary files /dev/null and b/assets/stickers/food/beans.png differ diff --git a/assets/stickers/food/bell-pepper.png b/assets/stickers/food/bell-pepper.png new file mode 100644 index 00000000000..74e18b68cdf Binary files /dev/null and b/assets/stickers/food/bell-pepper.png differ diff --git a/assets/stickers/food/birthday-cake.png b/assets/stickers/food/birthday-cake.png new file mode 100644 index 00000000000..fbb80c4e490 Binary files /dev/null and b/assets/stickers/food/birthday-cake.png differ diff --git a/assets/stickers/food/biscuit.png b/assets/stickers/food/biscuit.png new file mode 100644 index 00000000000..660dff4a1ac Binary files /dev/null and b/assets/stickers/food/biscuit.png differ diff --git a/assets/stickers/food/boiled-egg.png b/assets/stickers/food/boiled-egg.png new file mode 100644 index 00000000000..fb4a1e867e4 Binary files /dev/null and b/assets/stickers/food/boiled-egg.png differ diff --git a/assets/stickers/food/bread.png b/assets/stickers/food/bread.png new file mode 100644 index 00000000000..ed19ee71023 Binary files /dev/null and b/assets/stickers/food/bread.png differ diff --git a/assets/stickers/food/broccoli.png b/assets/stickers/food/broccoli.png new file mode 100644 index 00000000000..9a13522ce2f Binary files /dev/null and b/assets/stickers/food/broccoli.png differ diff --git a/assets/stickers/food/brochette.png b/assets/stickers/food/brochette.png new file mode 100644 index 00000000000..3658cbd7771 Binary files /dev/null and b/assets/stickers/food/brochette.png differ diff --git a/assets/stickers/food/burger-1.png b/assets/stickers/food/burger-1.png new file mode 100644 index 00000000000..3f7f3ff6621 Binary files /dev/null and b/assets/stickers/food/burger-1.png differ diff --git a/assets/stickers/food/burger.png b/assets/stickers/food/burger.png new file mode 100644 index 00000000000..203d336ffb8 Binary files /dev/null and b/assets/stickers/food/burger.png differ diff --git a/assets/stickers/food/burrito.png b/assets/stickers/food/burrito.png new file mode 100644 index 00000000000..3c3c3e5b080 Binary files /dev/null and b/assets/stickers/food/burrito.png differ diff --git a/assets/stickers/food/cake.png b/assets/stickers/food/cake.png new file mode 100644 index 00000000000..0d59a3e3cf2 Binary files /dev/null and b/assets/stickers/food/cake.png differ diff --git a/assets/stickers/food/candy-cane.png b/assets/stickers/food/candy-cane.png new file mode 100644 index 00000000000..3d8f048262d Binary files /dev/null and b/assets/stickers/food/candy-cane.png differ diff --git a/assets/stickers/food/candy.png b/assets/stickers/food/candy.png new file mode 100644 index 00000000000..1fb7d708192 Binary files /dev/null and b/assets/stickers/food/candy.png differ diff --git a/assets/stickers/food/carrot.png b/assets/stickers/food/carrot.png new file mode 100644 index 00000000000..1ca46171611 Binary files /dev/null and b/assets/stickers/food/carrot.png differ diff --git a/assets/stickers/food/cheese.png b/assets/stickers/food/cheese.png new file mode 100644 index 00000000000..df545a670ad Binary files /dev/null and b/assets/stickers/food/cheese.png differ diff --git a/assets/stickers/food/cherry.png b/assets/stickers/food/cherry.png new file mode 100644 index 00000000000..c1081f47a34 Binary files /dev/null and b/assets/stickers/food/cherry.png differ diff --git a/assets/stickers/food/chicken-leg.png b/assets/stickers/food/chicken-leg.png new file mode 100644 index 00000000000..044084cb37d Binary files /dev/null and b/assets/stickers/food/chicken-leg.png differ diff --git a/assets/stickers/food/chili-pepper.png b/assets/stickers/food/chili-pepper.png new file mode 100644 index 00000000000..163271db49e Binary files /dev/null and b/assets/stickers/food/chili-pepper.png differ diff --git a/assets/stickers/food/chocolate.png b/assets/stickers/food/chocolate.png new file mode 100644 index 00000000000..dd2a7f27f1c Binary files /dev/null and b/assets/stickers/food/chocolate.png differ diff --git a/assets/stickers/food/chorizo.png b/assets/stickers/food/chorizo.png new file mode 100644 index 00000000000..fe524120a36 Binary files /dev/null and b/assets/stickers/food/chorizo.png differ diff --git a/assets/stickers/food/corn.png b/assets/stickers/food/corn.png new file mode 100644 index 00000000000..b1e5c32f492 Binary files /dev/null and b/assets/stickers/food/corn.png differ diff --git a/assets/stickers/food/cotton-candy.png b/assets/stickers/food/cotton-candy.png new file mode 100644 index 00000000000..1013eb2eeb1 Binary files /dev/null and b/assets/stickers/food/cotton-candy.png differ diff --git a/assets/stickers/food/crab.png b/assets/stickers/food/crab.png new file mode 100644 index 00000000000..1a1e2774255 Binary files /dev/null and b/assets/stickers/food/crab.png differ diff --git a/assets/stickers/food/croissant.png b/assets/stickers/food/croissant.png new file mode 100644 index 00000000000..0cc7ff36869 Binary files /dev/null and b/assets/stickers/food/croissant.png differ diff --git a/assets/stickers/food/cupcake-1.png b/assets/stickers/food/cupcake-1.png new file mode 100644 index 00000000000..26fc0ed2165 Binary files /dev/null and b/assets/stickers/food/cupcake-1.png differ diff --git a/assets/stickers/food/cupcake.png b/assets/stickers/food/cupcake.png new file mode 100644 index 00000000000..61b93ab6e08 Binary files /dev/null and b/assets/stickers/food/cupcake.png differ diff --git a/assets/stickers/food/doner-kebab.png b/assets/stickers/food/doner-kebab.png new file mode 100644 index 00000000000..47fc90d10eb Binary files /dev/null and b/assets/stickers/food/doner-kebab.png differ diff --git a/assets/stickers/food/donut.png b/assets/stickers/food/donut.png new file mode 100644 index 00000000000..463b16438b1 Binary files /dev/null and b/assets/stickers/food/donut.png differ diff --git a/assets/stickers/food/drink.png b/assets/stickers/food/drink.png new file mode 100644 index 00000000000..269aad4de9e Binary files /dev/null and b/assets/stickers/food/drink.png differ diff --git a/assets/stickers/food/fish.png b/assets/stickers/food/fish.png new file mode 100644 index 00000000000..754e1df4a53 Binary files /dev/null and b/assets/stickers/food/fish.png differ diff --git a/assets/stickers/food/french-fries.png b/assets/stickers/food/french-fries.png new file mode 100644 index 00000000000..f26bf8aa35e Binary files /dev/null and b/assets/stickers/food/french-fries.png differ diff --git a/assets/stickers/food/fried-egg.png b/assets/stickers/food/fried-egg.png new file mode 100644 index 00000000000..ce6cd45cd29 Binary files /dev/null and b/assets/stickers/food/fried-egg.png differ diff --git a/assets/stickers/food/garlic.png b/assets/stickers/food/garlic.png new file mode 100644 index 00000000000..53a697ea0c4 Binary files /dev/null and b/assets/stickers/food/garlic.png differ diff --git a/assets/stickers/food/gingerbread-man.png b/assets/stickers/food/gingerbread-man.png new file mode 100644 index 00000000000..f3de236dcb7 Binary files /dev/null and b/assets/stickers/food/gingerbread-man.png differ diff --git a/assets/stickers/food/grapes.png b/assets/stickers/food/grapes.png new file mode 100644 index 00000000000..4b44de88333 Binary files /dev/null and b/assets/stickers/food/grapes.png differ diff --git a/assets/stickers/food/honey.png b/assets/stickers/food/honey.png new file mode 100644 index 00000000000..fcb5a88a65d Binary files /dev/null and b/assets/stickers/food/honey.png differ diff --git a/assets/stickers/food/hot-dog.png b/assets/stickers/food/hot-dog.png new file mode 100644 index 00000000000..ac7a7c9c14d Binary files /dev/null and b/assets/stickers/food/hot-dog.png differ diff --git a/assets/stickers/food/ice-cream.png b/assets/stickers/food/ice-cream.png new file mode 100644 index 00000000000..b7957676e11 Binary files /dev/null and b/assets/stickers/food/ice-cream.png differ diff --git a/assets/stickers/food/jam.png b/assets/stickers/food/jam.png new file mode 100644 index 00000000000..ec0ad544d8d Binary files /dev/null and b/assets/stickers/food/jam.png differ diff --git a/assets/stickers/food/jelly.png b/assets/stickers/food/jelly.png new file mode 100644 index 00000000000..d8da5f5c0b6 Binary files /dev/null and b/assets/stickers/food/jelly.png differ diff --git a/assets/stickers/food/ketchup.png b/assets/stickers/food/ketchup.png new file mode 100644 index 00000000000..6918b393379 Binary files /dev/null and b/assets/stickers/food/ketchup.png differ diff --git a/assets/stickers/food/kiwi.png b/assets/stickers/food/kiwi.png new file mode 100644 index 00000000000..dd6e03bf781 Binary files /dev/null and b/assets/stickers/food/kiwi.png differ diff --git a/assets/stickers/food/lemon.png b/assets/stickers/food/lemon.png new file mode 100644 index 00000000000..c9a46827226 Binary files /dev/null and b/assets/stickers/food/lemon.png differ diff --git a/assets/stickers/food/lettuce.png b/assets/stickers/food/lettuce.png new file mode 100644 index 00000000000..0e98a66811b Binary files /dev/null and b/assets/stickers/food/lettuce.png differ diff --git a/assets/stickers/food/lobster.png b/assets/stickers/food/lobster.png new file mode 100644 index 00000000000..e81ef920099 Binary files /dev/null and b/assets/stickers/food/lobster.png differ diff --git a/assets/stickers/food/lollipop-1.png b/assets/stickers/food/lollipop-1.png new file mode 100644 index 00000000000..0ac95d80ef3 Binary files /dev/null and b/assets/stickers/food/lollipop-1.png differ diff --git a/assets/stickers/food/lollipop.png b/assets/stickers/food/lollipop.png new file mode 100644 index 00000000000..6e80ca6b4a8 Binary files /dev/null and b/assets/stickers/food/lollipop.png differ diff --git a/assets/stickers/food/macarons.png b/assets/stickers/food/macarons.png new file mode 100644 index 00000000000..8235533ca04 Binary files /dev/null and b/assets/stickers/food/macarons.png differ diff --git a/assets/stickers/food/muffin.png b/assets/stickers/food/muffin.png new file mode 100644 index 00000000000..66c49b5d491 Binary files /dev/null and b/assets/stickers/food/muffin.png differ diff --git a/assets/stickers/food/mushroom.png b/assets/stickers/food/mushroom.png new file mode 100644 index 00000000000..787e88aaa3c Binary files /dev/null and b/assets/stickers/food/mushroom.png differ diff --git a/assets/stickers/food/mussel.png b/assets/stickers/food/mussel.png new file mode 100644 index 00000000000..bfbe8fb3577 Binary files /dev/null and b/assets/stickers/food/mussel.png differ diff --git a/assets/stickers/food/noodles.png b/assets/stickers/food/noodles.png new file mode 100644 index 00000000000..e23b8b7498f Binary files /dev/null and b/assets/stickers/food/noodles.png differ diff --git a/assets/stickers/food/olive-oil.png b/assets/stickers/food/olive-oil.png new file mode 100644 index 00000000000..e23608592c2 Binary files /dev/null and b/assets/stickers/food/olive-oil.png differ diff --git a/assets/stickers/food/olives.png b/assets/stickers/food/olives.png new file mode 100644 index 00000000000..10f4447149d Binary files /dev/null and b/assets/stickers/food/olives.png differ diff --git a/assets/stickers/food/onion-rings.png b/assets/stickers/food/onion-rings.png new file mode 100644 index 00000000000..45e266c6e29 Binary files /dev/null and b/assets/stickers/food/onion-rings.png differ diff --git a/assets/stickers/food/onion.png b/assets/stickers/food/onion.png new file mode 100644 index 00000000000..9d9357066cd Binary files /dev/null and b/assets/stickers/food/onion.png differ diff --git a/assets/stickers/food/orange.png b/assets/stickers/food/orange.png new file mode 100644 index 00000000000..23f35fc7876 Binary files /dev/null and b/assets/stickers/food/orange.png differ diff --git a/assets/stickers/food/pancakes.png b/assets/stickers/food/pancakes.png new file mode 100644 index 00000000000..e7550258aaf Binary files /dev/null and b/assets/stickers/food/pancakes.png differ diff --git a/assets/stickers/food/pasta.png b/assets/stickers/food/pasta.png new file mode 100644 index 00000000000..c68500294c5 Binary files /dev/null and b/assets/stickers/food/pasta.png differ diff --git a/assets/stickers/food/peach.png b/assets/stickers/food/peach.png new file mode 100644 index 00000000000..6826b4b7799 Binary files /dev/null and b/assets/stickers/food/peach.png differ diff --git a/assets/stickers/food/pear.png b/assets/stickers/food/pear.png new file mode 100644 index 00000000000..21a09b3dc41 Binary files /dev/null and b/assets/stickers/food/pear.png differ diff --git a/assets/stickers/food/pepper.png b/assets/stickers/food/pepper.png new file mode 100644 index 00000000000..241bfe317eb Binary files /dev/null and b/assets/stickers/food/pepper.png differ diff --git a/assets/stickers/food/pie.png b/assets/stickers/food/pie.png new file mode 100644 index 00000000000..cc10302a990 Binary files /dev/null and b/assets/stickers/food/pie.png differ diff --git a/assets/stickers/food/pineapple.png b/assets/stickers/food/pineapple.png new file mode 100644 index 00000000000..71eb128141b Binary files /dev/null and b/assets/stickers/food/pineapple.png differ diff --git a/assets/stickers/food/pizza.png b/assets/stickers/food/pizza.png new file mode 100644 index 00000000000..0161cf59c5b Binary files /dev/null and b/assets/stickers/food/pizza.png differ diff --git a/assets/stickers/food/popcorn.png b/assets/stickers/food/popcorn.png new file mode 100644 index 00000000000..43c8477f12b Binary files /dev/null and b/assets/stickers/food/popcorn.png differ diff --git a/assets/stickers/food/prawn.png b/assets/stickers/food/prawn.png new file mode 100644 index 00000000000..afe5431ab12 Binary files /dev/null and b/assets/stickers/food/prawn.png differ diff --git a/assets/stickers/food/pretzel.png b/assets/stickers/food/pretzel.png new file mode 100644 index 00000000000..bbe72aa23b5 Binary files /dev/null and b/assets/stickers/food/pretzel.png differ diff --git a/assets/stickers/food/pumpkin.png b/assets/stickers/food/pumpkin.png new file mode 100644 index 00000000000..4572125205c Binary files /dev/null and b/assets/stickers/food/pumpkin.png differ diff --git a/assets/stickers/food/radish.png b/assets/stickers/food/radish.png new file mode 100644 index 00000000000..5284a8b4d1a Binary files /dev/null and b/assets/stickers/food/radish.png differ diff --git a/assets/stickers/food/raspberry.png b/assets/stickers/food/raspberry.png new file mode 100644 index 00000000000..e0238f530fa Binary files /dev/null and b/assets/stickers/food/raspberry.png differ diff --git a/assets/stickers/food/rice.png b/assets/stickers/food/rice.png new file mode 100644 index 00000000000..55bd59397c1 Binary files /dev/null and b/assets/stickers/food/rice.png differ diff --git a/assets/stickers/food/roast-chicken.png b/assets/stickers/food/roast-chicken.png new file mode 100644 index 00000000000..afff0a926a2 Binary files /dev/null and b/assets/stickers/food/roast-chicken.png differ diff --git a/assets/stickers/food/salad.png b/assets/stickers/food/salad.png new file mode 100644 index 00000000000..c9f0e4e6b19 Binary files /dev/null and b/assets/stickers/food/salad.png differ diff --git a/assets/stickers/food/salt.png b/assets/stickers/food/salt.png new file mode 100644 index 00000000000..6850890abfd Binary files /dev/null and b/assets/stickers/food/salt.png differ diff --git a/assets/stickers/food/sandwich-1.png b/assets/stickers/food/sandwich-1.png new file mode 100644 index 00000000000..d7fd4ca4b4a Binary files /dev/null and b/assets/stickers/food/sandwich-1.png differ diff --git a/assets/stickers/food/sandwich.png b/assets/stickers/food/sandwich.png new file mode 100644 index 00000000000..ac6c5f8a433 Binary files /dev/null and b/assets/stickers/food/sandwich.png differ diff --git a/assets/stickers/food/sardine.png b/assets/stickers/food/sardine.png new file mode 100644 index 00000000000..41dcfeac6cf Binary files /dev/null and b/assets/stickers/food/sardine.png differ diff --git a/assets/stickers/food/soup.png b/assets/stickers/food/soup.png new file mode 100644 index 00000000000..c40c4c172e7 Binary files /dev/null and b/assets/stickers/food/soup.png differ diff --git a/assets/stickers/food/soya.png b/assets/stickers/food/soya.png new file mode 100644 index 00000000000..3af760957b1 Binary files /dev/null and b/assets/stickers/food/soya.png differ diff --git a/assets/stickers/food/steak.png b/assets/stickers/food/steak.png new file mode 100644 index 00000000000..ed6b842dc51 Binary files /dev/null and b/assets/stickers/food/steak.png differ diff --git a/assets/stickers/food/strawberry.png b/assets/stickers/food/strawberry.png new file mode 100644 index 00000000000..e40ca7ad63a Binary files /dev/null and b/assets/stickers/food/strawberry.png differ diff --git a/assets/stickers/food/sushi.png b/assets/stickers/food/sushi.png new file mode 100644 index 00000000000..0f5cd26670f Binary files /dev/null and b/assets/stickers/food/sushi.png differ diff --git a/assets/stickers/food/taco.png b/assets/stickers/food/taco.png new file mode 100644 index 00000000000..75596a2d35d Binary files /dev/null and b/assets/stickers/food/taco.png differ diff --git a/assets/stickers/food/toaster.png b/assets/stickers/food/toaster.png new file mode 100644 index 00000000000..d0fa0d8c1bb Binary files /dev/null and b/assets/stickers/food/toaster.png differ diff --git a/assets/stickers/food/tomato.png b/assets/stickers/food/tomato.png new file mode 100644 index 00000000000..db3b66cd648 Binary files /dev/null and b/assets/stickers/food/tomato.png differ diff --git a/assets/stickers/food/tuna.png b/assets/stickers/food/tuna.png new file mode 100644 index 00000000000..57c9a34c3d6 Binary files /dev/null and b/assets/stickers/food/tuna.png differ diff --git a/assets/stickers/food/vinegar.png b/assets/stickers/food/vinegar.png new file mode 100644 index 00000000000..ea3d718e1be Binary files /dev/null and b/assets/stickers/food/vinegar.png differ diff --git a/assets/stickers/food/watermelon.png b/assets/stickers/food/watermelon.png new file mode 100644 index 00000000000..6997e3d10ae Binary files /dev/null and b/assets/stickers/food/watermelon.png differ diff --git a/assets/stickers/food/yogurt.png b/assets/stickers/food/yogurt.png new file mode 100644 index 00000000000..b3ea7125732 Binary files /dev/null and b/assets/stickers/food/yogurt.png differ diff --git a/assets/stickers/weather/cloud.png b/assets/stickers/weather/cloud.png new file mode 100644 index 00000000000..ef4fb37cb83 Binary files /dev/null and b/assets/stickers/weather/cloud.png differ diff --git a/assets/stickers/weather/cloudy-1.png b/assets/stickers/weather/cloudy-1.png new file mode 100644 index 00000000000..0d3660034cd Binary files /dev/null and b/assets/stickers/weather/cloudy-1.png differ diff --git a/assets/stickers/weather/cloudy-night.png b/assets/stickers/weather/cloudy-night.png new file mode 100644 index 00000000000..1bf8aea2c53 Binary files /dev/null and b/assets/stickers/weather/cloudy-night.png differ diff --git a/assets/stickers/weather/cloudy.png b/assets/stickers/weather/cloudy.png new file mode 100644 index 00000000000..11f835d669e Binary files /dev/null and b/assets/stickers/weather/cloudy.png differ diff --git a/assets/stickers/weather/eclipse.png b/assets/stickers/weather/eclipse.png new file mode 100644 index 00000000000..cf32f42ffd8 Binary files /dev/null and b/assets/stickers/weather/eclipse.png differ diff --git a/assets/stickers/weather/full-moon.png b/assets/stickers/weather/full-moon.png new file mode 100644 index 00000000000..05397836978 Binary files /dev/null and b/assets/stickers/weather/full-moon.png differ diff --git a/assets/stickers/weather/hail.png b/assets/stickers/weather/hail.png new file mode 100644 index 00000000000..0c816e8db9a Binary files /dev/null and b/assets/stickers/weather/hail.png differ diff --git a/assets/stickers/weather/lightning.png b/assets/stickers/weather/lightning.png new file mode 100644 index 00000000000..3ea01115f6c Binary files /dev/null and b/assets/stickers/weather/lightning.png differ diff --git a/assets/stickers/weather/moon-phases-1.png b/assets/stickers/weather/moon-phases-1.png new file mode 100644 index 00000000000..862d9530e4d Binary files /dev/null and b/assets/stickers/weather/moon-phases-1.png differ diff --git a/assets/stickers/weather/moon-phases-2.png b/assets/stickers/weather/moon-phases-2.png new file mode 100644 index 00000000000..3060dce0319 Binary files /dev/null and b/assets/stickers/weather/moon-phases-2.png differ diff --git a/assets/stickers/weather/moon-phases-3.png b/assets/stickers/weather/moon-phases-3.png new file mode 100644 index 00000000000..91c9beac545 Binary files /dev/null and b/assets/stickers/weather/moon-phases-3.png differ diff --git a/assets/stickers/weather/moon-phases-4.png b/assets/stickers/weather/moon-phases-4.png new file mode 100644 index 00000000000..48b851c965a Binary files /dev/null and b/assets/stickers/weather/moon-phases-4.png differ diff --git a/assets/stickers/weather/moon-phases-5.png b/assets/stickers/weather/moon-phases-5.png new file mode 100644 index 00000000000..9e3808340c8 Binary files /dev/null and b/assets/stickers/weather/moon-phases-5.png differ diff --git a/assets/stickers/weather/moon-phases.png b/assets/stickers/weather/moon-phases.png new file mode 100644 index 00000000000..bc075453639 Binary files /dev/null and b/assets/stickers/weather/moon-phases.png differ diff --git a/assets/stickers/weather/planet-earth.png b/assets/stickers/weather/planet-earth.png new file mode 100644 index 00000000000..43e150a9f95 Binary files /dev/null and b/assets/stickers/weather/planet-earth.png differ diff --git a/assets/stickers/weather/rain-1.png b/assets/stickers/weather/rain-1.png new file mode 100644 index 00000000000..d0675e7eb83 Binary files /dev/null and b/assets/stickers/weather/rain-1.png differ diff --git a/assets/stickers/weather/rain.png b/assets/stickers/weather/rain.png new file mode 100644 index 00000000000..8d1e8d67719 Binary files /dev/null and b/assets/stickers/weather/rain.png differ diff --git a/assets/stickers/weather/raindrop.png b/assets/stickers/weather/raindrop.png new file mode 100644 index 00000000000..7cfdb25ea5d Binary files /dev/null and b/assets/stickers/weather/raindrop.png differ diff --git a/assets/stickers/weather/rainy-1.png b/assets/stickers/weather/rainy-1.png new file mode 100644 index 00000000000..ea3c6d96334 Binary files /dev/null and b/assets/stickers/weather/rainy-1.png differ diff --git a/assets/stickers/weather/rainy.png b/assets/stickers/weather/rainy.png new file mode 100644 index 00000000000..811543b772b Binary files /dev/null and b/assets/stickers/weather/rainy.png differ diff --git a/assets/stickers/weather/snowflake.png b/assets/stickers/weather/snowflake.png new file mode 100644 index 00000000000..5c29926032f Binary files /dev/null and b/assets/stickers/weather/snowflake.png differ diff --git a/assets/stickers/weather/storm.png b/assets/stickers/weather/storm.png new file mode 100644 index 00000000000..3ef7df8e57a Binary files /dev/null and b/assets/stickers/weather/storm.png differ diff --git a/assets/stickers/weather/sun.png b/assets/stickers/weather/sun.png new file mode 100644 index 00000000000..79112507eb5 Binary files /dev/null and b/assets/stickers/weather/sun.png differ diff --git a/assets/stickers/weather/temperature-1.png b/assets/stickers/weather/temperature-1.png new file mode 100644 index 00000000000..9a42e118bcc Binary files /dev/null and b/assets/stickers/weather/temperature-1.png differ diff --git a/assets/stickers/weather/temperature.png b/assets/stickers/weather/temperature.png new file mode 100644 index 00000000000..3aed2004749 Binary files /dev/null and b/assets/stickers/weather/temperature.png differ diff --git a/assets/stickers/weather/thermometer-1.png b/assets/stickers/weather/thermometer-1.png new file mode 100644 index 00000000000..7a61974e9d8 Binary files /dev/null and b/assets/stickers/weather/thermometer-1.png differ diff --git a/assets/stickers/weather/thermometer-2.png b/assets/stickers/weather/thermometer-2.png new file mode 100644 index 00000000000..b4a67d9e3ea Binary files /dev/null and b/assets/stickers/weather/thermometer-2.png differ diff --git a/assets/stickers/weather/thermometer.png b/assets/stickers/weather/thermometer.png new file mode 100644 index 00000000000..2d1e7baec81 Binary files /dev/null and b/assets/stickers/weather/thermometer.png differ diff --git a/assets/stickers/weather/tornado.png b/assets/stickers/weather/tornado.png new file mode 100644 index 00000000000..fbe95eab511 Binary files /dev/null and b/assets/stickers/weather/tornado.png differ diff --git a/assets/stickers/weather/wind.png b/assets/stickers/weather/wind.png new file mode 100644 index 00000000000..450c052d9b2 Binary files /dev/null and b/assets/stickers/weather/wind.png differ diff --git a/build.gradle b/build.gradle index 70fa66832d9..0023c48fd39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { repositories { - mavenLocal() maven { url "https://repo1.maven.org/maven2" + jcenter() } } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.2.3' classpath files('libs/gradle-witness.jar') } } @@ -18,32 +18,17 @@ repositories { maven { url "https://repo1.maven.org/maven2/" } - maven { - url "https://raw.github.com/whispersystems/maven/master/preferencefragment/releases/" - } - maven { - url "https://raw.github.com/whispersystems/maven/master/smil/releases/" - } - maven { - url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/" - } - maven { // textdrawable - url 'https://dl.bintray.com/amulyakhare/maven' - } jcenter() mavenLocal() } dependencies { - compile 'me.leolin:ShortcutBadger:1.1.0-WS1' + compile project(':libs:ShortcutBadger:ShortcutBadger') + compile project(':libs:PhotoView:library') compile 'se.emilsjolander:stickylistheaders:2.7.0' - compile 'com.google.android.gms:play-services-gcm:8.1.0' - compile 'com.google.android.gms:play-services-maps:8.1.0' - compile 'com.google.android.gms:play-services-location:8.1.0' compile 'com.jpardogo.materialtabstrip:library:1.0.9' - compile 'org.w3c:smil:1.0.0' + compile project(':libs:org.w3c.dom') compile 'org.apache.httpcomponents:httpclient-android:4.3.5' - compile 'com.github.chrisbanes.photoview:library:1.2.3' compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.makeramen:roundedimageview:2.1.0' compile 'com.pnikosis:materialish-progress:1.5' @@ -56,9 +41,8 @@ dependencies { compile 'com.android.support:cardview-v7:22.2.1' compile 'com.melnykov:floatingactionbutton:1.3.0' compile 'com.google.zxing:android-integration:3.1.0' - compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){ - exclude module: 'support-v4' - } + compile project('libs:android-support-v4-preferencefragment') + compile ('com.android.support:gridlayout-v7:22.2.0') { exclude module: 'support-v4' } @@ -73,10 +57,15 @@ dependencies { compile 'org.whispersystems:jobmanager:1.0.2' compile 'org.whispersystems:libpastelog:1.0.7' compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - compile 'org.whispersystems:textsecure-android:2.8.6' + compile project(':android') + compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0' compile 'com.google.zxing:core:3.2.1' + compile ('cn.carbswang.android:NumberPickerView:1.0.9') { + exclude group: 'com.android.support', module: 'appcompat-v7' + } + testCompile 'junit:junit:4.12' testCompile 'org.assertj:assertj-core:1.7.1' testCompile 'org.mockito:mockito-core:1.9.5' @@ -90,7 +79,7 @@ dependencies { androidTestCompile ('org.assertj:assertj-core:1.7.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' } - androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') { + androidTestCompile ('com.squareup.assertj:assertj-android:1.1.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' exclude group: 'com.android.support', module: 'support-annotations' } @@ -98,15 +87,12 @@ dependencies { dependencyVerification { verify = [ - 'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9', + //'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9', 'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb', - 'com.google.android.gms:play-services-gcm:757ecd2c837ac81c98f4cc7dc783e7454c6d0506f6cc66b10417126b675248c9', - 'com.google.android.gms:play-services-maps:c58a9d98a98889fb0b27f78100f2d9341ed7722db24ccf832df62b6e8ce1b42e', - 'com.google.android.gms:play-services-location:8226f778aa86bd15b9143f62425262cc53d64021990f62eb1aaec108d4e25f35', 'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa', - 'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b', + //'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b', 'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1', - 'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc', + //'com.github.chrisbanes.photoview:library:f152dd0a87aca891aa182e42863fa05e0e8b2842e3b9fc512d7a3a6243c38ac4', 'com.github.bumptech.glide:glide:76ef123957b5fbaebb05fcbe6606dd58c3bc3fcdadb257f99811d0ac9ea9b88b', 'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1', 'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54', @@ -119,7 +105,7 @@ dependencyVerification { 'com.android.support:cardview-v7:2c2354761a4e20ba451ae903ab808f15c9acc8343b1e74001869c2d0a672c1fc', 'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263', 'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4', - 'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad', + //'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad', 'com.android.support:gridlayout-v7:a9b770cffca2c7c5cd83cba4dd12503365de5e8d9c79c479165adf18ab3bc25b', 'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883', 'com.doomonafireball.betterpickers:library:132ecd685c95a99e7377c4e27bfadbb2d7ed0bea995944060cd62d4369fdaf3d', @@ -127,51 +113,53 @@ dependencyVerification { 'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181', 'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88', 'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb', - 'org.whispersystems:textsecure-android:0405821f479985677d6d5f4032eaaa732e04562c1975969cbaea37939030ec96', + //'org.whispersystems:signal-service-android:1c89623336505f6511e6f68ea126c85eae7f28f6c72beb6b362e5743bc5e5126', 'com.h6ah4i.android.compat:mulsellistprefcompat:47167c5cb796de1a854788e9ff318358e36c8fb88123baaa6e38fb78511dfabe', 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259', - 'com.google.android.gms:play-services-base:ef36e50fa5c0415ed41f74dd399a889efd2fa327c449036e140c7c3786aa0e1f', - 'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a', + //'com.android.support:support-annotations:1e4d471c5378b283d95abfb128e7ed3c6b3cb19bb6f0c317a9b75e48e99365ff', 'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a', 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f', - 'org.whispersystems:textsecure-java:d4ee0d0537693f82b7a9f76fe32cf6b61f79e27d8657a486ee4959b54b738c5a', - 'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0', - 'com.google.android.gms:play-services-basement:e1d29b21e02fd2a63e5a31807415cbb17a59568e27e3254181c01ffae10659bf', - 'com.googlecode.libphonenumber:libphonenumber:9625de9d2270e9a280ff4e6d9ef3106573fb4828773fd32c9b7614f4e17d2811', + //'org.whispersystems:signal-service-java:48db52056aa3510deb8c4ccd2dfb35033ae115bc4176048820c6dff73290ba6e', + 'org.whispersystems:signal-protocol-android:1b4b9d557c8eaf861797ff683990d482d4aa8e9f23d9b17ff0cc67a02f38cb19', + 'com.googlecode.libphonenumber:libphonenumber:7214dc6dfc6243e34fb1a3e02ad15331bfff6ab902d679e3ba337695265c21ca', 'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74', 'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af', 'com.fasterxml.jackson.core:jackson-databind:835097bcdd11f5bc8a08378c70d4c8054dfa4b911691cc2752063c75534d198d', - 'org.whispersystems:axolotl-java:6daee739b89d8d7101de6d98f77132fee48495c6ea647d880e77def842f999ea', - 'org.whispersystems:curve25519-android:3c29a4131a69b0d16baaa3d707678deb39602c3a3ffd75805ce7f9db252e5d0d', + 'org.whispersystems:curve25519-android:bf6c34223d45d2f2813a8efcab9923caf99115115c760c9acea680bcb42d23c0', + 'org.whispersystems:signal-protocol-java:a835cd0609cf116a74651bd0aa748db9392bba48c2d2af787757b8a1b50d131c', 'com.squareup.okio:okio:5e1098bd3fdee4c3347f5ab815b40ba851e4ab1b348c5e49a5b0362f0ce6e978', 'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94', 'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0', - 'org.whispersystems:curve25519-java:9ccef8f5aba05d9942336f023c589d6278b4f9135bdc34a7bade1f4e7ad65fa3', - 'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423', - ] + 'org.whispersystems:curve25519-java:00f1d4919f759055f41f7853a3d475dc7c8decf0dbf045ae93414f8f23b066cc', + 'com.android.support:support-v4:ed4cda7c752f51d33f9bbdfff3422b425b323d356cd1bdc9786aa413c912e594', + ] } android { - compileSdkVersion 22 - buildToolsVersion '22.0.1' - - dexOptions { - javaMaxHeapSize "4g" - } + compileSdkVersion 24 + buildToolsVersion '23.0.3' + useLibrary 'org.apache.http.legacy' defaultConfig { + applicationId "org.libresignal" minSdkVersion 9 targetSdkVersion 22 - buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L" + vectorDrawables.useSupportLibrary = true + + buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L" buildConfigField "String", "TEXTSECURE_URL", "\"https://textsecure-service.whispersystems.org\"" - buildConfigField "String", "USER_AGENT", "\"JEN\"" + buildConfigField "String", "USER_AGENT", "\"LSA\"" + buildConfigField "String[]", "CENSORED_COUNTRIES", "{\"+20\", \"+971\", \"+53\", \"+968\"}" + buildConfigField "String", "UNCENSORED_FRONTING_HOST", "\"https://www.google.com\"" + buildConfigField "String", "CENSORED_REFLECTOR", "\"signal-reflector-meek.appspot.com\"" + buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\"" + buildConfigField "int", "GIPHY_PROXY_PORT", "80" buildConfigField "String", "REDPHONE_MASTER_URL", "\"https://redphone-master.whispersystems.org\"" buildConfigField "String", "REDPHONE_RELAY_HOST", "\"relay.whispersystems.org\"" buildConfigField "String", "REDPHONE_PREFIX_NAME", "\".whispersystems.org\"" buildConfigField "boolean", "DEV_BUILD", "false" - buildConfigField "boolean", "FORCE_WEBSOCKETS", "false" } compileOptions { @@ -209,33 +197,18 @@ android { 'proguard-shortcutbadger.pro', 'proguard-retrofit.pro', 'proguard.cfg' + //buildConfigField "String", "TEXTSECURE_URL", "\"https://textsecure-service-staging.whispersystems.org\"" + //buildConfigField "String", "REDPHONE_MASTER_URL", "\"https://redphone-staging.whispersystems.org\"" + //buildConfigField "String", "REDPHONE_RELAY_HOST", "\"redphone-staging-relay.whispersystems.org\"" + testProguardFiles 'proguard-automation.pro' } release { minifyEnabled true proguardFiles = buildTypes.debug.proguardFiles signingConfig signingConfigs.release } - dev.initWith(buildTypes.debug) - dev { - buildConfigField "boolean", "DEV_BUILD", "true" - versionNameSuffix "-dev" - } - websockets.initWith(buildTypes.dev) - websockets { - buildConfigField "boolean", "FORCE_WEBSOCKETS", "true" - } } - productFlavors { - prod { - // defaults - } - staging { - buildConfigField "String", "TEXTSECURE_URL", "\"https://textsecure-service-staging.whispersystems.org\"" - buildConfigField "String", "REDPHONE_MASTER_URL", "\"https://redphone-staging.whispersystems.org\"" - buildConfigField "String", "REDPHONE_RELAY_HOST", "\"redphone-staging-relay.whispersystems.org\"" - } - } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -257,6 +230,7 @@ android { lintOptions { abortOnError false + disable 'MissingTranslation' } } @@ -266,6 +240,18 @@ tasks.whenTaskAdded { task -> } } +def getLastCommitTimestamp() { + new ByteArrayOutputStream().withStream { os -> + def result = exec { + executable = 'git' + args = ['log', '-1', '--pretty=format:%ct'] + standardOutput = os + } + + return os.toString() + "000" + } +} + def Properties props = new Properties() def propFile = new File('signing.properties') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 513819a3ab6..7dc78b5e79c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 22 14:31:11 PDT 2015 +#Sun Aug 28 20:14:40 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/jni/Android.mk b/jni/Android.mk index 2882b8f5ce2..3d4190875cb 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -53,6 +53,14 @@ libwebrtc_spl \ libwebrtc_vad \ libcrypto_static - include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) + +LOCAL_MODULE := native-utils +LOCAL_C_INCLUDES := $(JNI_DIR)/utils/ +LOCAL_CFLAGS += -Wall + +LOCAL_SRC_FILES := $(JNI_DIR)/utils/org_thoughtcrime_securesms_util_FileUtils.cpp + +include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/jni/openssl/crypto/pkcs7/p7/a1 b/jni/openssl/crypto/pkcs7/p7/a1 deleted file mode 100644 index 56ca9437626..00000000000 --- a/jni/openssl/crypto/pkcs7/p7/a1 +++ /dev/null @@ -1,2 +0,0 @@ -j,H>_æá_­DôzEîLœ VJ³ß觬¤””E3ûáYäx%_Àk -3ê)DLScñ8% ôM \ No newline at end of file diff --git a/jni/openssl/crypto/pkcs7/p7/a2 b/jni/openssl/crypto/pkcs7/p7/a2 deleted file mode 100644 index 23d8fb5e93b..00000000000 --- a/jni/openssl/crypto/pkcs7/p7/a2 +++ /dev/null @@ -1 +0,0 @@ -k~@a”,NâM͹¼ ­×U¿o_½BqrmÎ?Ù t?t÷ÏéId2‰Š \ No newline at end of file diff --git a/jni/redphone/RtpAudioReceiver.cpp b/jni/redphone/RtpAudioReceiver.cpp index 616dd525c95..12e111d06e2 100644 --- a/jni/redphone/RtpAudioReceiver.cpp +++ b/jni/redphone/RtpAudioReceiver.cpp @@ -26,6 +26,11 @@ RtpPacket* RtpAudioReceiver::receive(char* encodedData, int encodedDataLen) { return NULL; } + if (received < RtpPacket::getMinimumSize()) { + __android_log_print(ANDROID_LOG_WARN, TAG, "recveived malformed packet!"); + return NULL; + } + RtpPacket *packet = new RtpPacket(encodedData, received); if (srtpStream.decrypt(*packet, sequenceCounter.convertNext(packet->getSequenceNumber())) != 0) { diff --git a/jni/redphone/RtpPacket.h b/jni/redphone/RtpPacket.h index 2a06563945f..bacd251490c 100644 --- a/jni/redphone/RtpPacket.h +++ b/jni/redphone/RtpPacket.h @@ -21,6 +21,10 @@ class RtpPacket { RtpPacket(char *payload, int payloadLen, int sequenceNumber, int timestamp); ~RtpPacket(); + static int getMinimumSize() { + return sizeof(RtpHeader); + } + uint16_t getSequenceNumber(); int getPayloadType(); uint32_t getTimestamp(); diff --git a/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp b/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp new file mode 100644 index 00000000000..ef86ac8e350 --- /dev/null +++ b/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp @@ -0,0 +1,31 @@ +#include "org_thoughtcrime_securesms_util_FileUtils.h" + +#include +#include +#include + +jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner + (JNIEnv *env, jclass clazz, jobject fileDescriptor) +{ + jclass fdClass = env->GetObjectClass(fileDescriptor); + + if (fdClass == NULL) { + return -1; + } + + jfieldID fdFieldId = env->GetFieldID(fdClass, "descriptor", "I"); + + if (fdFieldId == NULL) { + return -1; + } + + int fd = env->GetIntField(fileDescriptor, fdFieldId); + + struct stat stat_struct; + + if (fstat(fd, &stat_struct) != 0) { + return -1; + } + + return stat_struct.st_uid; +} \ No newline at end of file diff --git a/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h b/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h new file mode 100644 index 00000000000..abf13b35bcf --- /dev/null +++ b/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_thoughtcrime_securesms_util_FileUtils */ + +#ifndef _Included_org_thoughtcrime_securesms_util_FileUtils +#define _Included_org_thoughtcrime_securesms_util_FileUtils +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_thoughtcrime_securesms_util_FileUtils + * Method: getFileDescriptorOwner + * Signature: (Ljava/io/FileDescriptor;)I + */ +JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner + (JNIEnv *, jclass, jobject); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/libs/.gitignore b/libs/.gitignore new file mode 100644 index 00000000000..140f8cf80f2 --- /dev/null +++ b/libs/.gitignore @@ -0,0 +1 @@ +*.so diff --git a/libs/PhotoView b/libs/PhotoView new file mode 160000 index 00000000000..10e13fd7610 --- /dev/null +++ b/libs/PhotoView @@ -0,0 +1 @@ +Subproject commit 10e13fd761084dcbceb5245b7b5bfb6903f11e5d diff --git a/libs/ShortcutBadger b/libs/ShortcutBadger new file mode 160000 index 00000000000..226f4f889b8 --- /dev/null +++ b/libs/ShortcutBadger @@ -0,0 +1 @@ +Subproject commit 226f4f889b8afd6326c1aa5da513f8db09dd1bd5 diff --git a/libs/android-support-v4-preferencefragment b/libs/android-support-v4-preferencefragment new file mode 160000 index 00000000000..717a45433b9 --- /dev/null +++ b/libs/android-support-v4-preferencefragment @@ -0,0 +1 @@ +Subproject commit 717a45433b927d2f0dfc5328f79e77c9682c37bc diff --git a/libs/armeabi-v7a/libredphone-audio.so b/libs/armeabi-v7a/libredphone-audio.so index a8241c8e54d..50c624dbfd2 100755 Binary files a/libs/armeabi-v7a/libredphone-audio.so and b/libs/armeabi-v7a/libredphone-audio.so differ diff --git a/libs/armeabi/libredphone-audio.so b/libs/armeabi/libredphone-audio.so index 7949956a034..951f3a4c404 100755 Binary files a/libs/armeabi/libredphone-audio.so and b/libs/armeabi/libredphone-audio.so differ diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar index 561041d3661..6ab83e59625 100644 Binary files a/libs/gradle-witness.jar and b/libs/gradle-witness.jar differ diff --git a/libs/libtextsecure-java b/libs/libtextsecure-java new file mode 160000 index 00000000000..8d68eb20629 --- /dev/null +++ b/libs/libtextsecure-java @@ -0,0 +1 @@ +Subproject commit 8d68eb20629aad3224086ef2e49df1eebe4ae3a7 diff --git a/libs/org.w3c.dom b/libs/org.w3c.dom new file mode 160000 index 00000000000..91f12458e37 --- /dev/null +++ b/libs/org.w3c.dom @@ -0,0 +1 @@ +Subproject commit 91f12458e37bbb783f49ec97bcd070dd62c3070b diff --git a/libs/x86/libredphone-audio.so b/libs/x86/libredphone-audio.so index 597cc96c1c1..9968b3408e6 100755 Binary files a/libs/x86/libredphone-audio.so and b/libs/x86/libredphone-audio.so differ diff --git a/proguard-appcompat-v7.pro b/proguard-appcompat-v7.pro index 718eb9da93b..f0d673934f8 100644 --- a/proguard-appcompat-v7.pro +++ b/proguard-appcompat-v7.pro @@ -7,3 +7,7 @@ -keep public class * extends android.support.v4.view.ActionProvider { public (android.content.Context); } + +-keepattributes *Annotation* +-keep public class * extends android.support.design.widget.CoordinatorLayout.Behavior { *; } +-keep public class * extends android.support.design.widget.ViewOffsetBehavior { *; } diff --git a/proguard-spongycastle.pro b/proguard-spongycastle.pro index 42dbe10897d..26c6842672d 100644 --- a/proguard-spongycastle.pro +++ b/proguard-spongycastle.pro @@ -11,7 +11,11 @@ -keep class org.spongycastle.crypto.prng.* {*;} -keep class org.spongycastle.crypto.signers.* {*;} --keep class org.spongycastle.jcajce.provider.asymmetric.** {*;} +-keep class org.spongycastle.jcajce.provider.asymmetric.* {*;} +-keep class org.spongycastle.jcajce.provider.asymmetric.util.* {*;} +-keep class org.spongycastle.jcajce.provider.asymmetric.dh.* {*;} +-keep class org.spongycastle.jcajce.provider.asymmetric.ec.* {*;} + -keep class org.spongycastle.jcajce.provider.digest.** {*;} -keep class org.spongycastle.jcajce.provider.keystore.** {*;} -keep class org.spongycastle.jcajce.provider.symmetric.** {*;} diff --git a/res/animator/bottom_pause_to_play_animation.xml b/res/animator/bottom_pause_to_play_animation.xml new file mode 100644 index 00000000000..f5b474bb709 --- /dev/null +++ b/res/animator/bottom_pause_to_play_animation.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/res/animator/bottom_play_to_pause_animation.xml b/res/animator/bottom_play_to_pause_animation.xml new file mode 100644 index 00000000000..4f2778d6853 --- /dev/null +++ b/res/animator/bottom_play_to_pause_animation.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/res/animator/rotate_90_animation.xml b/res/animator/rotate_90_animation.xml new file mode 100644 index 00000000000..7d44ce6900a --- /dev/null +++ b/res/animator/rotate_90_animation.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/res/animator/rotate_minus_90_animation.xml b/res/animator/rotate_minus_90_animation.xml new file mode 100644 index 00000000000..ef9e1b6f1f7 --- /dev/null +++ b/res/animator/rotate_minus_90_animation.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/res/animator/upper_pause_to_play_animation.xml b/res/animator/upper_pause_to_play_animation.xml new file mode 100644 index 00000000000..880c7b0b83f --- /dev/null +++ b/res/animator/upper_pause_to_play_animation.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/res/animator/upper_play_to_pause_animation.xml b/res/animator/upper_play_to_pause_animation.xml new file mode 100644 index 00000000000..ffa933231cb --- /dev/null +++ b/res/animator/upper_play_to_pause_animation.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/res/drawable-hdpi-v11/icon_cached.png b/res/drawable-hdpi-v11/icon_cached.png index a752f80ecb7..777153ba4db 100644 Binary files a/res/drawable-hdpi-v11/icon_cached.png and b/res/drawable-hdpi-v11/icon_cached.png differ diff --git a/res/drawable-hdpi-v9/icon_cached.png b/res/drawable-hdpi-v9/icon_cached.png deleted file mode 100644 index 979b2fe918d..00000000000 Binary files a/res/drawable-hdpi-v9/icon_cached.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_brush_white_24dp.png b/res/drawable-hdpi/ic_brush_white_24dp.png new file mode 100644 index 00000000000..c8aa20ca2b0 Binary files /dev/null and b/res/drawable-hdpi/ic_brush_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_check_white_36dp.png b/res/drawable-hdpi/ic_check_white_36dp.png new file mode 100644 index 00000000000..9e3f948c938 Binary files /dev/null and b/res/drawable-hdpi/ic_check_white_36dp.png differ diff --git a/res/drawable-hdpi/ic_check_white_48dp.png b/res/drawable-hdpi/ic_check_white_48dp.png new file mode 100644 index 00000000000..2c2ad771f72 Binary files /dev/null and b/res/drawable-hdpi/ic_check_white_48dp.png differ diff --git a/res/drawable-hdpi/ic_circle_fill_white_48dp.png b/res/drawable-hdpi/ic_circle_fill_white_48dp.png new file mode 100644 index 00000000000..a417946f2ac Binary files /dev/null and b/res/drawable-hdpi/ic_circle_fill_white_48dp.png differ diff --git a/res/drawable-hdpi/ic_close_white_48dp.png b/res/drawable-hdpi/ic_close_white_48dp.png new file mode 100644 index 00000000000..6b717e0dda8 Binary files /dev/null and b/res/drawable-hdpi/ic_close_white_48dp.png differ diff --git a/res/drawable-hdpi/ic_dashboard_white_24dp.png b/res/drawable-hdpi/ic_dashboard_white_24dp.png new file mode 100644 index 00000000000..3208779f855 Binary files /dev/null and b/res/drawable-hdpi/ic_dashboard_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_dark.png b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png new file mode 100644 index 00000000000..f6adac4d806 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_activity_activated_light.png b/res/drawable-hdpi/ic_emoji_activity_activated_light.png new file mode 100644 index 00000000000..cec4c2ba310 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_dark.png b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png new file mode 100644 index 00000000000..a61dcce747b Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_activity_normal_light.png b/res/drawable-hdpi/ic_emoji_activity_normal_light.png new file mode 100644 index 00000000000..f6adac4d806 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_activity_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_dark.png b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png new file mode 100644 index 00000000000..cb37eb1f06a Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_flag_activated_light.png b/res/drawable-hdpi/ic_emoji_flag_activated_light.png new file mode 100644 index 00000000000..97bc953d62e Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_dark.png b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png new file mode 100644 index 00000000000..56583915da8 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_flag_normal_light.png b/res/drawable-hdpi/ic_emoji_flag_normal_light.png new file mode 100644 index 00000000000..cb37eb1f06a Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_flag_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_dark.png b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png new file mode 100644 index 00000000000..2f07dbb6580 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_foods_activated_light.png b/res/drawable-hdpi/ic_emoji_foods_activated_light.png new file mode 100644 index 00000000000..365785adaf9 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_dark.png b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png new file mode 100644 index 00000000000..5c533050f1d Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_foods_normal_light.png b/res/drawable-hdpi/ic_emoji_foods_normal_light.png new file mode 100644 index 00000000000..2f07dbb6580 Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_foods_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png index 8ae67c762a4..8e970200bfa 100644 Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-hdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_activated_light.png b/res/drawable-hdpi/ic_emoji_nature_activated_light.png index 5d02a02a30a..b6f53b41dba 100644 Binary files a/res/drawable-hdpi/ic_emoji_nature_activated_light.png and b/res/drawable-hdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png index fd22d38a4f2..90ca0acb571 100644 Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-hdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_nature_normal_light.png b/res/drawable-hdpi/ic_emoji_nature_normal_light.png index 2a939505236..8e970200bfa 100644 Binary files a/res/drawable-hdpi/ic_emoji_nature_normal_light.png and b/res/drawable-hdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_object_activated_dark.png b/res/drawable-hdpi/ic_emoji_object_activated_dark.png new file mode 100644 index 00000000000..823394d6e7b Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_object_activated_light.png b/res/drawable-hdpi/ic_emoji_object_activated_light.png new file mode 100644 index 00000000000..2ece8ceadab Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_object_normal_dark.png b/res/drawable-hdpi/ic_emoji_object_normal_dark.png new file mode 100644 index 00000000000..23f6b43a08a Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_object_normal_light.png b/res/drawable-hdpi/ic_emoji_object_normal_light.png new file mode 100644 index 00000000000..823394d6e7b Binary files /dev/null and b/res/drawable-hdpi/ic_emoji_object_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_activated_dark.png b/res/drawable-hdpi/ic_emoji_people_activated_dark.png index e70241562c1..787d0002cf8 100644 Binary files a/res/drawable-hdpi/ic_emoji_people_activated_dark.png and b/res/drawable-hdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_activated_light.png b/res/drawable-hdpi/ic_emoji_people_activated_light.png index b16705c5f80..262ea943a2c 100644 Binary files a/res/drawable-hdpi/ic_emoji_people_activated_light.png and b/res/drawable-hdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_normal_dark.png b/res/drawable-hdpi/ic_emoji_people_normal_dark.png index aea6cfe795a..e581af307a9 100644 Binary files a/res/drawable-hdpi/ic_emoji_people_normal_dark.png and b/res/drawable-hdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_people_normal_light.png b/res/drawable-hdpi/ic_emoji_people_normal_light.png index 00bc3b6d00a..787d0002cf8 100644 Binary files a/res/drawable-hdpi/ic_emoji_people_normal_light.png and b/res/drawable-hdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_activated_dark.png b/res/drawable-hdpi/ic_emoji_places_activated_dark.png index b4683d11c14..721281d84f9 100644 Binary files a/res/drawable-hdpi/ic_emoji_places_activated_dark.png and b/res/drawable-hdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_activated_light.png b/res/drawable-hdpi/ic_emoji_places_activated_light.png index f6d936827d1..78a4a39e007 100644 Binary files a/res/drawable-hdpi/ic_emoji_places_activated_light.png and b/res/drawable-hdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_normal_dark.png b/res/drawable-hdpi/ic_emoji_places_normal_dark.png index 4527cdefced..1744eb741c3 100644 Binary files a/res/drawable-hdpi/ic_emoji_places_normal_dark.png and b/res/drawable-hdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_places_normal_light.png b/res/drawable-hdpi/ic_emoji_places_normal_light.png index ebcfd5a2915..721281d84f9 100644 Binary files a/res/drawable-hdpi/ic_emoji_places_normal_light.png and b/res/drawable-hdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png index 9738d5d6a8f..05fe46c8bfc 100644 Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-hdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png index dbe027f33c5..76c8b1ba027 100644 Binary files a/res/drawable-hdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-hdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png index 7c768717c71..6f56d2d57f0 100644 Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-hdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png index dddaa949686..05fe46c8bfc 100644 Binary files a/res/drawable-hdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-hdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-hdpi/ic_flag_white_24dp.png b/res/drawable-hdpi/ic_flag_white_24dp.png new file mode 100644 index 00000000000..f0f86ad04e6 Binary files /dev/null and b/res/drawable-hdpi/ic_flag_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_gif_white_36dp.png b/res/drawable-hdpi/ic_gif_white_36dp.png new file mode 100644 index 00000000000..17b6ed692e2 Binary files /dev/null and b/res/drawable-hdpi/ic_gif_white_36dp.png differ diff --git a/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png new file mode 100644 index 00000000000..785feac7dbf Binary files /dev/null and b/res/drawable-hdpi/ic_hourglass_empty_white_18dp.png differ diff --git a/res/drawable-hdpi/ic_hourglass_full_white_18dp.png b/res/drawable-hdpi/ic_hourglass_full_white_18dp.png new file mode 100644 index 00000000000..323c14dc337 Binary files /dev/null and b/res/drawable-hdpi/ic_hourglass_full_white_18dp.png differ diff --git a/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png new file mode 100644 index 00000000000..c9dd4c1ec0b Binary files /dev/null and b/res/drawable-hdpi/ic_lightbulb_outline_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_local_dining_white_24dp.png b/res/drawable-hdpi/ic_local_dining_white_24dp.png new file mode 100644 index 00000000000..04dec6088ba Binary files /dev/null and b/res/drawable-hdpi/ic_local_dining_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_menu_lock_dark.png b/res/drawable-hdpi/ic_menu_lock_dark.png new file mode 100644 index 00000000000..de260b90692 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_lock_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_lock_holo_dark.png b/res/drawable-hdpi/ic_menu_lock_holo_dark.png deleted file mode 100644 index ed62fb8e8d1..00000000000 Binary files a/res/drawable-hdpi/ic_menu_lock_holo_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_pets_white_24dp.png b/res/drawable-hdpi/ic_pets_white_24dp.png new file mode 100644 index 00000000000..9094bb55a58 Binary files /dev/null and b/res/drawable-hdpi/ic_pets_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_photo_library_white_24dp.png b/res/drawable-hdpi/ic_photo_library_white_24dp.png new file mode 100644 index 00000000000..c4a2229e94c Binary files /dev/null and b/res/drawable-hdpi/ic_photo_library_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 00000000000..6e1b578c54d Binary files /dev/null and b/res/drawable-hdpi/ic_play_circle_outline_white_48dp.png differ diff --git a/res/drawable-hdpi/ic_replay_white_24dp.png b/res/drawable-hdpi/ic_replay_white_24dp.png new file mode 100644 index 00000000000..5ef425a1708 Binary files /dev/null and b/res/drawable-hdpi/ic_replay_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_security_white_24dp.png b/res/drawable-hdpi/ic_security_white_24dp.png new file mode 100644 index 00000000000..262800a4d89 Binary files /dev/null and b/res/drawable-hdpi/ic_security_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_share_white_24dp.png b/res/drawable-hdpi/ic_share_white_24dp.png new file mode 100644 index 00000000000..b09a6926de5 Binary files /dev/null and b/res/drawable-hdpi/ic_share_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_tag_faces_white_24dp.png b/res/drawable-hdpi/ic_tag_faces_white_24dp.png new file mode 100644 index 00000000000..3aeae65b146 Binary files /dev/null and b/res/drawable-hdpi/ic_tag_faces_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_text_fields_white_24dp.png b/res/drawable-hdpi/ic_text_fields_white_24dp.png new file mode 100644 index 00000000000..a675d51c6e5 Binary files /dev/null and b/res/drawable-hdpi/ic_text_fields_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_timer_off_white_24dp.png b/res/drawable-hdpi/ic_timer_off_white_24dp.png new file mode 100644 index 00000000000..60136f7b519 Binary files /dev/null and b/res/drawable-hdpi/ic_timer_off_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_timer_white_24dp.png b/res/drawable-hdpi/ic_timer_white_24dp.png new file mode 100644 index 00000000000..10619fc8c5c Binary files /dev/null and b/res/drawable-hdpi/ic_timer_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_view_stream_white_24dp.png b/res/drawable-hdpi/ic_view_stream_white_24dp.png new file mode 100644 index 00000000000..857becfc246 Binary files /dev/null and b/res/drawable-hdpi/ic_view_stream_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_wb_sunny_white_24dp.png b/res/drawable-hdpi/ic_wb_sunny_white_24dp.png new file mode 100644 index 00000000000..e0bdc4934da Binary files /dev/null and b/res/drawable-hdpi/ic_wb_sunny_white_24dp.png differ diff --git a/res/drawable-hdpi/ic_work_white_24dp.png b/res/drawable-hdpi/ic_work_white_24dp.png new file mode 100644 index 00000000000..87c5a053d1a Binary files /dev/null and b/res/drawable-hdpi/ic_work_white_24dp.png differ diff --git a/res/drawable-hdpi/icon_cached.png b/res/drawable-hdpi/icon_cached.png new file mode 100644 index 00000000000..d319ca5216a Binary files /dev/null and b/res/drawable-hdpi/icon_cached.png differ diff --git a/res/drawable-hdpi/poweredby_giphy.png b/res/drawable-hdpi/poweredby_giphy.png new file mode 100644 index 00000000000..df5e4f06e13 Binary files /dev/null and b/res/drawable-hdpi/poweredby_giphy.png differ diff --git a/res/drawable-mdpi-v11/icon_cached.png b/res/drawable-mdpi-v11/icon_cached.png index 994f08c782b..5654c491471 100644 Binary files a/res/drawable-mdpi-v11/icon_cached.png and b/res/drawable-mdpi-v11/icon_cached.png differ diff --git a/res/drawable-mdpi-v9/icon_cached.png b/res/drawable-mdpi-v9/icon_cached.png deleted file mode 100644 index dd146f705f2..00000000000 Binary files a/res/drawable-mdpi-v9/icon_cached.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_brush_white_24dp.png b/res/drawable-mdpi/ic_brush_white_24dp.png new file mode 100644 index 00000000000..ae4dd03dc9c Binary files /dev/null and b/res/drawable-mdpi/ic_brush_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_check_white_36dp.png b/res/drawable-mdpi/ic_check_white_36dp.png new file mode 100644 index 00000000000..729f2901047 Binary files /dev/null and b/res/drawable-mdpi/ic_check_white_36dp.png differ diff --git a/res/drawable-mdpi/ic_check_white_48dp.png b/res/drawable-mdpi/ic_check_white_48dp.png new file mode 100644 index 00000000000..3b2b65d2629 Binary files /dev/null and b/res/drawable-mdpi/ic_check_white_48dp.png differ diff --git a/res/drawable-mdpi/ic_circle_fill_white_48dp.png b/res/drawable-mdpi/ic_circle_fill_white_48dp.png new file mode 100644 index 00000000000..783f82cf1e7 Binary files /dev/null and b/res/drawable-mdpi/ic_circle_fill_white_48dp.png differ diff --git a/res/drawable-mdpi/ic_close_white_48dp.png b/res/drawable-mdpi/ic_close_white_48dp.png new file mode 100644 index 00000000000..b7c7ffd0e79 Binary files /dev/null and b/res/drawable-mdpi/ic_close_white_48dp.png differ diff --git a/res/drawable-mdpi/ic_dashboard_white_24dp.png b/res/drawable-mdpi/ic_dashboard_white_24dp.png new file mode 100644 index 00000000000..1614347a829 Binary files /dev/null and b/res/drawable-mdpi/ic_dashboard_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_dark.png b/res/drawable-mdpi/ic_emoji_activity_activated_dark.png new file mode 100644 index 00000000000..4a1574abea1 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_activity_activated_light.png b/res/drawable-mdpi/ic_emoji_activity_activated_light.png new file mode 100644 index 00000000000..677223f79f0 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_dark.png b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png new file mode 100644 index 00000000000..bfcafda8a90 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_activity_normal_light.png b/res/drawable-mdpi/ic_emoji_activity_normal_light.png new file mode 100644 index 00000000000..4a1574abea1 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_activity_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_dark.png b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png new file mode 100644 index 00000000000..ae1ca3f9d48 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_flag_activated_light.png b/res/drawable-mdpi/ic_emoji_flag_activated_light.png new file mode 100644 index 00000000000..2bc9f8f09ba Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_dark.png b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png new file mode 100644 index 00000000000..ede66c9761b Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_flag_normal_light.png b/res/drawable-mdpi/ic_emoji_flag_normal_light.png new file mode 100644 index 00000000000..ae1ca3f9d48 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_flag_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_dark.png b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png new file mode 100644 index 00000000000..785deee0182 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_foods_activated_light.png b/res/drawable-mdpi/ic_emoji_foods_activated_light.png new file mode 100644 index 00000000000..68efa0a50e2 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_dark.png b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png new file mode 100644 index 00000000000..aed613d5bc6 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_foods_normal_light.png b/res/drawable-mdpi/ic_emoji_foods_normal_light.png new file mode 100644 index 00000000000..785deee0182 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_foods_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png index 04d0559515d..7de887a96e3 100644 Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-mdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_activated_light.png b/res/drawable-mdpi/ic_emoji_nature_activated_light.png index c37a2334542..234f2d98029 100644 Binary files a/res/drawable-mdpi/ic_emoji_nature_activated_light.png and b/res/drawable-mdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png index 2e460a0bd44..d63616d118e 100644 Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-mdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_nature_normal_light.png b/res/drawable-mdpi/ic_emoji_nature_normal_light.png index e1e93c7563b..7de887a96e3 100644 Binary files a/res/drawable-mdpi/ic_emoji_nature_normal_light.png and b/res/drawable-mdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_object_activated_dark.png b/res/drawable-mdpi/ic_emoji_object_activated_dark.png new file mode 100644 index 00000000000..6206af2b2bc Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_object_activated_light.png b/res/drawable-mdpi/ic_emoji_object_activated_light.png new file mode 100644 index 00000000000..11f25dcc69a Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_object_normal_dark.png b/res/drawable-mdpi/ic_emoji_object_normal_dark.png new file mode 100644 index 00000000000..cdc756575c3 Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_object_normal_light.png b/res/drawable-mdpi/ic_emoji_object_normal_light.png new file mode 100644 index 00000000000..6206af2b2bc Binary files /dev/null and b/res/drawable-mdpi/ic_emoji_object_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_activated_dark.png b/res/drawable-mdpi/ic_emoji_people_activated_dark.png index faf91ff98e9..91cae22a776 100644 Binary files a/res/drawable-mdpi/ic_emoji_people_activated_dark.png and b/res/drawable-mdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_activated_light.png b/res/drawable-mdpi/ic_emoji_people_activated_light.png index 4ca14de904b..353a3100a2a 100644 Binary files a/res/drawable-mdpi/ic_emoji_people_activated_light.png and b/res/drawable-mdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_normal_dark.png b/res/drawable-mdpi/ic_emoji_people_normal_dark.png index c027acc1b09..851df9e9649 100644 Binary files a/res/drawable-mdpi/ic_emoji_people_normal_dark.png and b/res/drawable-mdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_people_normal_light.png b/res/drawable-mdpi/ic_emoji_people_normal_light.png index 94009c3647d..91cae22a776 100644 Binary files a/res/drawable-mdpi/ic_emoji_people_normal_light.png and b/res/drawable-mdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_activated_dark.png b/res/drawable-mdpi/ic_emoji_places_activated_dark.png index d000e34b455..ceab263b395 100644 Binary files a/res/drawable-mdpi/ic_emoji_places_activated_dark.png and b/res/drawable-mdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_activated_light.png b/res/drawable-mdpi/ic_emoji_places_activated_light.png index 3fc3956d904..23ae27f1408 100644 Binary files a/res/drawable-mdpi/ic_emoji_places_activated_light.png and b/res/drawable-mdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_normal_dark.png b/res/drawable-mdpi/ic_emoji_places_normal_dark.png index 137813ec4d6..67f90d42f67 100644 Binary files a/res/drawable-mdpi/ic_emoji_places_normal_dark.png and b/res/drawable-mdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_places_normal_light.png b/res/drawable-mdpi/ic_emoji_places_normal_light.png index 59acd0078e7..ceab263b395 100644 Binary files a/res/drawable-mdpi/ic_emoji_places_normal_light.png and b/res/drawable-mdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png index a2a9a985563..3aca48546c7 100644 Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-mdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png index 7cbd256cb15..3db7b5a0fbb 100644 Binary files a/res/drawable-mdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-mdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png index 62fef53d337..aa56d6b40f7 100644 Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-mdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png index 39956edf3ed..3aca48546c7 100644 Binary files a/res/drawable-mdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-mdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-mdpi/ic_flag_white_24dp.png b/res/drawable-mdpi/ic_flag_white_24dp.png new file mode 100644 index 00000000000..0d2c5f65c1a Binary files /dev/null and b/res/drawable-mdpi/ic_flag_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_gif_white_36dp.png b/res/drawable-mdpi/ic_gif_white_36dp.png new file mode 100644 index 00000000000..0978a141a9f Binary files /dev/null and b/res/drawable-mdpi/ic_gif_white_36dp.png differ diff --git a/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png new file mode 100644 index 00000000000..e1db32b3cbc Binary files /dev/null and b/res/drawable-mdpi/ic_hourglass_empty_white_18dp.png differ diff --git a/res/drawable-mdpi/ic_hourglass_full_white_18dp.png b/res/drawable-mdpi/ic_hourglass_full_white_18dp.png new file mode 100644 index 00000000000..1b7feed9bb9 Binary files /dev/null and b/res/drawable-mdpi/ic_hourglass_full_white_18dp.png differ diff --git a/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png new file mode 100644 index 00000000000..91702b1d6b3 Binary files /dev/null and b/res/drawable-mdpi/ic_lightbulb_outline_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_local_dining_white_24dp.png b/res/drawable-mdpi/ic_local_dining_white_24dp.png new file mode 100644 index 00000000000..5b68bb59ae2 Binary files /dev/null and b/res/drawable-mdpi/ic_local_dining_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_menu_lock_dark.png b/res/drawable-mdpi/ic_menu_lock_dark.png new file mode 100644 index 00000000000..530ca8c6e6d Binary files /dev/null and b/res/drawable-mdpi/ic_menu_lock_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_lock_holo_dark.png b/res/drawable-mdpi/ic_menu_lock_holo_dark.png deleted file mode 100644 index 771cfc179d0..00000000000 Binary files a/res/drawable-mdpi/ic_menu_lock_holo_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_pets_white_24dp.png b/res/drawable-mdpi/ic_pets_white_24dp.png new file mode 100644 index 00000000000..1194342fb55 Binary files /dev/null and b/res/drawable-mdpi/ic_pets_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_photo_library_white_24dp.png b/res/drawable-mdpi/ic_photo_library_white_24dp.png new file mode 100644 index 00000000000..02ef4cdb008 Binary files /dev/null and b/res/drawable-mdpi/ic_photo_library_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 00000000000..615b80d0854 Binary files /dev/null and b/res/drawable-mdpi/ic_play_circle_outline_white_48dp.png differ diff --git a/res/drawable-mdpi/ic_replay_white_24dp.png b/res/drawable-mdpi/ic_replay_white_24dp.png new file mode 100644 index 00000000000..5a79970a98b Binary files /dev/null and b/res/drawable-mdpi/ic_replay_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_security_white_24dp.png b/res/drawable-mdpi/ic_security_white_24dp.png new file mode 100644 index 00000000000..44ee7346e38 Binary files /dev/null and b/res/drawable-mdpi/ic_security_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_share_white_24dp.png b/res/drawable-mdpi/ic_share_white_24dp.png new file mode 100644 index 00000000000..e944fd70c42 Binary files /dev/null and b/res/drawable-mdpi/ic_share_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_tag_faces_white_24dp.png b/res/drawable-mdpi/ic_tag_faces_white_24dp.png new file mode 100644 index 00000000000..e6cc505f9fc Binary files /dev/null and b/res/drawable-mdpi/ic_tag_faces_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_text_fields_white_24dp.png b/res/drawable-mdpi/ic_text_fields_white_24dp.png new file mode 100644 index 00000000000..1b45ea0b414 Binary files /dev/null and b/res/drawable-mdpi/ic_text_fields_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_timer_off_white_24dp.png b/res/drawable-mdpi/ic_timer_off_white_24dp.png new file mode 100644 index 00000000000..b3a619767ca Binary files /dev/null and b/res/drawable-mdpi/ic_timer_off_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_timer_white_24dp.png b/res/drawable-mdpi/ic_timer_white_24dp.png new file mode 100644 index 00000000000..72e1320c468 Binary files /dev/null and b/res/drawable-mdpi/ic_timer_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_view_stream_white_24dp.png b/res/drawable-mdpi/ic_view_stream_white_24dp.png new file mode 100644 index 00000000000..a0a663458ae Binary files /dev/null and b/res/drawable-mdpi/ic_view_stream_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_wb_sunny_white_24dp.png b/res/drawable-mdpi/ic_wb_sunny_white_24dp.png new file mode 100644 index 00000000000..58458b22a5a Binary files /dev/null and b/res/drawable-mdpi/ic_wb_sunny_white_24dp.png differ diff --git a/res/drawable-mdpi/ic_work_white_24dp.png b/res/drawable-mdpi/ic_work_white_24dp.png new file mode 100644 index 00000000000..ba06d79a766 Binary files /dev/null and b/res/drawable-mdpi/ic_work_white_24dp.png differ diff --git a/res/drawable-mdpi/icon_cached.png b/res/drawable-mdpi/icon_cached.png new file mode 100644 index 00000000000..07d3a7e9d58 Binary files /dev/null and b/res/drawable-mdpi/icon_cached.png differ diff --git a/res/drawable-mdpi/poweredby_giphy.png b/res/drawable-mdpi/poweredby_giphy.png new file mode 100644 index 00000000000..0cee864a36e Binary files /dev/null and b/res/drawable-mdpi/poweredby_giphy.png differ diff --git a/res/drawable-xhdpi-v11/icon_cached.png b/res/drawable-xhdpi-v11/icon_cached.png index b8c5e402fb1..66a4b60dd38 100644 Binary files a/res/drawable-xhdpi-v11/icon_cached.png and b/res/drawable-xhdpi-v11/icon_cached.png differ diff --git a/res/drawable-xhdpi/ic_brush_white_24dp.png b/res/drawable-xhdpi/ic_brush_white_24dp.png new file mode 100644 index 00000000000..6a7239478f7 Binary files /dev/null and b/res/drawable-xhdpi/ic_brush_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_check_white_36dp.png b/res/drawable-xhdpi/ic_check_white_36dp.png new file mode 100644 index 00000000000..2c2ad771f72 Binary files /dev/null and b/res/drawable-xhdpi/ic_check_white_36dp.png differ diff --git a/res/drawable-xhdpi/ic_check_white_48dp.png b/res/drawable-xhdpi/ic_check_white_48dp.png new file mode 100644 index 00000000000..d670618c7e9 Binary files /dev/null and b/res/drawable-xhdpi/ic_check_white_48dp.png differ diff --git a/res/drawable-xhdpi/ic_circle_fill_white_48dp.png b/res/drawable-xhdpi/ic_circle_fill_white_48dp.png new file mode 100644 index 00000000000..0bd9683860e Binary files /dev/null and b/res/drawable-xhdpi/ic_circle_fill_white_48dp.png differ diff --git a/res/drawable-xhdpi/ic_close_white_48dp.png b/res/drawable-xhdpi/ic_close_white_48dp.png new file mode 100644 index 00000000000..39641921925 Binary files /dev/null and b/res/drawable-xhdpi/ic_close_white_48dp.png differ diff --git a/res/drawable-xhdpi/ic_dashboard_white_24dp.png b/res/drawable-xhdpi/ic_dashboard_white_24dp.png new file mode 100644 index 00000000000..da1a5852c9d Binary files /dev/null and b/res/drawable-xhdpi/ic_dashboard_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png new file mode 100644 index 00000000000..1d04bc797d1 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png new file mode 100644 index 00000000000..7001af641f3 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png new file mode 100644 index 00000000000..68b5d8d2ff8 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png new file mode 100644 index 00000000000..1d04bc797d1 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_activity_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png new file mode 100644 index 00000000000..471d644f843 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png new file mode 100644 index 00000000000..58a1b7bf2d6 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png new file mode 100644 index 00000000000..597de87f52e Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png new file mode 100644 index 00000000000..471d644f843 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_flag_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png new file mode 100644 index 00000000000..a49d4f55b10 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png new file mode 100644 index 00000000000..8ad2915cc88 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png new file mode 100644 index 00000000000..e1cac3ffc7e Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png new file mode 100644 index 00000000000..a49d4f55b10 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_foods_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png index 423ee33fa37..0b409d57ceb 100644 Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png index 2ed1a5447dd..c4e2e997789 100644 Binary files a/res/drawable-xhdpi/ic_emoji_nature_activated_light.png and b/res/drawable-xhdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png index 8b9a9a1b176..8bce7885657 100644 Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png index 711036f0323..0b409d57ceb 100644 Binary files a/res/drawable-xhdpi/ic_emoji_nature_normal_light.png and b/res/drawable-xhdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png new file mode 100644 index 00000000000..e7afca3f6ec Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_object_activated_light.png b/res/drawable-xhdpi/ic_emoji_object_activated_light.png new file mode 100644 index 00000000000..1b51f9e1282 Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png new file mode 100644 index 00000000000..02e7ea6d44a Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_object_normal_light.png b/res/drawable-xhdpi/ic_emoji_object_normal_light.png new file mode 100644 index 00000000000..e7afca3f6ec Binary files /dev/null and b/res/drawable-xhdpi/ic_emoji_object_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png index 91dd01151f0..693a1c69f6a 100644 Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_activated_light.png b/res/drawable-xhdpi/ic_emoji_people_activated_light.png index 965a7c45d2e..6ae3d264c91 100644 Binary files a/res/drawable-xhdpi/ic_emoji_people_activated_light.png and b/res/drawable-xhdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png index d6f523aa29f..fe91469aabe 100644 Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_people_normal_light.png b/res/drawable-xhdpi/ic_emoji_people_normal_light.png index 6e5078b5e4e..693a1c69f6a 100644 Binary files a/res/drawable-xhdpi/ic_emoji_people_normal_light.png and b/res/drawable-xhdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png index fd3022a28e4..0b368d62fb6 100644 Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_activated_light.png b/res/drawable-xhdpi/ic_emoji_places_activated_light.png index 098f36f9c1f..d4c49d78f29 100644 Binary files a/res/drawable-xhdpi/ic_emoji_places_activated_light.png and b/res/drawable-xhdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png index 425e2cc036d..fc67497e112 100644 Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_places_normal_light.png b/res/drawable-xhdpi/ic_emoji_places_normal_light.png index 86188352fde..0b368d62fb6 100644 Binary files a/res/drawable-xhdpi/ic_emoji_places_normal_light.png and b/res/drawable-xhdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png index 664a7375b93..a28e4a84ad7 100644 Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-xhdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png index 13b587852cb..a6f6ebc4e07 100644 Binary files a/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-xhdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png index cf5c6747db2..7c016ef6654 100644 Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-xhdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png index eaea7bd3333..a28e4a84ad7 100644 Binary files a/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-xhdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-xhdpi/ic_flag_white_24dp.png b/res/drawable-xhdpi/ic_flag_white_24dp.png new file mode 100644 index 00000000000..23c4bb7f0ad Binary files /dev/null and b/res/drawable-xhdpi/ic_flag_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_gif_white_36dp.png b/res/drawable-xhdpi/ic_gif_white_36dp.png new file mode 100644 index 00000000000..acdb6d0b904 Binary files /dev/null and b/res/drawable-xhdpi/ic_gif_white_36dp.png differ diff --git a/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png new file mode 100644 index 00000000000..b24e375a5ac Binary files /dev/null and b/res/drawable-xhdpi/ic_hourglass_empty_white_18dp.png differ diff --git a/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png new file mode 100644 index 00000000000..29ee1d09b3a Binary files /dev/null and b/res/drawable-xhdpi/ic_hourglass_full_white_18dp.png differ diff --git a/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png new file mode 100644 index 00000000000..afc7e537a6c Binary files /dev/null and b/res/drawable-xhdpi/ic_lightbulb_outline_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_local_dining_white_24dp.png b/res/drawable-xhdpi/ic_local_dining_white_24dp.png new file mode 100644 index 00000000000..e081e1afb81 Binary files /dev/null and b/res/drawable-xhdpi/ic_local_dining_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_menu_lock_dark.png b/res/drawable-xhdpi/ic_menu_lock_dark.png new file mode 100644 index 00000000000..34b753d5884 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_lock_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_lock_holo_dark.png b/res/drawable-xhdpi/ic_menu_lock_holo_dark.png deleted file mode 100644 index 36921cf3046..00000000000 Binary files a/res/drawable-xhdpi/ic_menu_lock_holo_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_pets_white_24dp.png b/res/drawable-xhdpi/ic_pets_white_24dp.png new file mode 100644 index 00000000000..f28287f3593 Binary files /dev/null and b/res/drawable-xhdpi/ic_pets_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_photo_library_white_24dp.png b/res/drawable-xhdpi/ic_photo_library_white_24dp.png new file mode 100644 index 00000000000..4bd2898a839 Binary files /dev/null and b/res/drawable-xhdpi/ic_photo_library_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 00000000000..516f6432693 Binary files /dev/null and b/res/drawable-xhdpi/ic_play_circle_outline_white_48dp.png differ diff --git a/res/drawable-xhdpi/ic_replay_white_24dp.png b/res/drawable-xhdpi/ic_replay_white_24dp.png new file mode 100644 index 00000000000..3b41913257d Binary files /dev/null and b/res/drawable-xhdpi/ic_replay_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_security_white_24dp.png b/res/drawable-xhdpi/ic_security_white_24dp.png new file mode 100644 index 00000000000..7e306c303cb Binary files /dev/null and b/res/drawable-xhdpi/ic_security_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_share_white_24dp.png b/res/drawable-xhdpi/ic_share_white_24dp.png new file mode 100644 index 00000000000..22a8783e70f Binary files /dev/null and b/res/drawable-xhdpi/ic_share_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_tag_faces_white_24dp.png b/res/drawable-xhdpi/ic_tag_faces_white_24dp.png new file mode 100644 index 00000000000..c97abc49f1f Binary files /dev/null and b/res/drawable-xhdpi/ic_tag_faces_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_text_fields_white_24dp.png b/res/drawable-xhdpi/ic_text_fields_white_24dp.png new file mode 100644 index 00000000000..612d143869d Binary files /dev/null and b/res/drawable-xhdpi/ic_text_fields_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_timer_off_white_24dp.png b/res/drawable-xhdpi/ic_timer_off_white_24dp.png new file mode 100644 index 00000000000..494a59fc8a7 Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_off_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_timer_white_24dp.png b/res/drawable-xhdpi/ic_timer_white_24dp.png new file mode 100644 index 00000000000..9d239966f32 Binary files /dev/null and b/res/drawable-xhdpi/ic_timer_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_view_stream_white_24dp.png b/res/drawable-xhdpi/ic_view_stream_white_24dp.png new file mode 100644 index 00000000000..9e640ae5596 Binary files /dev/null and b/res/drawable-xhdpi/ic_view_stream_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png b/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png new file mode 100644 index 00000000000..123f780c711 Binary files /dev/null and b/res/drawable-xhdpi/ic_wb_sunny_white_24dp.png differ diff --git a/res/drawable-xhdpi/ic_work_white_24dp.png b/res/drawable-xhdpi/ic_work_white_24dp.png new file mode 100644 index 00000000000..10ddce1027e Binary files /dev/null and b/res/drawable-xhdpi/ic_work_white_24dp.png differ diff --git a/res/drawable-xhdpi/icon_cached.png b/res/drawable-xhdpi/icon_cached.png new file mode 100644 index 00000000000..b34b69604cd Binary files /dev/null and b/res/drawable-xhdpi/icon_cached.png differ diff --git a/res/drawable-xhdpi/poweredby_giphy.png b/res/drawable-xhdpi/poweredby_giphy.png new file mode 100644 index 00000000000..09b38f190f6 Binary files /dev/null and b/res/drawable-xhdpi/poweredby_giphy.png differ diff --git a/res/drawable-xxhdpi-v11/icon_cached.png b/res/drawable-xxhdpi-v11/icon_cached.png new file mode 100644 index 00000000000..d17e250790f Binary files /dev/null and b/res/drawable-xxhdpi-v11/icon_cached.png differ diff --git a/res/drawable-xxhdpi/ic_brush_white_24dp.png b/res/drawable-xxhdpi/ic_brush_white_24dp.png new file mode 100644 index 00000000000..300529d20ec Binary files /dev/null and b/res/drawable-xxhdpi/ic_brush_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_check_white_36dp.png b/res/drawable-xxhdpi/ic_check_white_36dp.png new file mode 100644 index 00000000000..9b91350bc23 Binary files /dev/null and b/res/drawable-xxhdpi/ic_check_white_36dp.png differ diff --git a/res/drawable-xxhdpi/ic_check_white_48dp.png b/res/drawable-xxhdpi/ic_check_white_48dp.png new file mode 100644 index 00000000000..bfd7b82aaa1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_check_white_48dp.png differ diff --git a/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png b/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png new file mode 100644 index 00000000000..c83d5fba16a Binary files /dev/null and b/res/drawable-xxhdpi/ic_circle_fill_white_48dp.png differ diff --git a/res/drawable-xxhdpi/ic_close_white_48dp.png b/res/drawable-xxhdpi/ic_close_white_48dp.png new file mode 100644 index 00000000000..4927bc242e2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_close_white_48dp.png differ diff --git a/res/drawable-xxhdpi/ic_dashboard_white_24dp.png b/res/drawable-xxhdpi/ic_dashboard_white_24dp.png new file mode 100644 index 00000000000..471aa0db16e Binary files /dev/null and b/res/drawable-xxhdpi/ic_dashboard_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png new file mode 100644 index 00000000000..5cf9101c061 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png new file mode 100644 index 00000000000..76a4aebe5b1 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png new file mode 100644 index 00000000000..6d90599b1f8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png new file mode 100644 index 00000000000..5cf9101c061 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_activity_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png new file mode 100644 index 00000000000..5797242bc03 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png new file mode 100644 index 00000000000..adf73cf40fc Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png new file mode 100644 index 00000000000..47f75e2cae5 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png new file mode 100644 index 00000000000..5797242bc03 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_flag_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png new file mode 100644 index 00000000000..8a0be6d5059 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png new file mode 100644 index 00000000000..784f603a501 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png new file mode 100644 index 00000000000..ed5571a88ec Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png new file mode 100644 index 00000000000..8a0be6d5059 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_foods_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png index 4439faa92ed..15214246c20 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png index d0ae5eaf31c..65947ba0663 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png index 29ac9b5c62d..12a2324fd08 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png index a881fd5a54c..15214246c20 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png new file mode 100644 index 00000000000..41b8604be63 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png new file mode 100644 index 00000000000..1979f6513f3 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png new file mode 100644 index 00000000000..671eef82739 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png new file mode 100644 index 00000000000..41b8604be63 Binary files /dev/null and b/res/drawable-xxhdpi/ic_emoji_object_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png index b5a7ac55cfa..40753d285e6 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png index 4c532476467..2b6ed0c1635 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_people_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png index b73d3ba0c05..72df107d853 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png index f38fddc7f06..40753d285e6 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_people_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png index cba29598fc7..9ae9fc7b264 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png index 1a09a342903..a7fafaec649 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_places_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png index 2e752e6f0d9..dbdbd9e0cca 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png index c3b3b123e18..9ae9fc7b264 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_places_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png index 1e55d5d3058..780b6397dc4 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png index 83d76f150a2..2cb85bbd80c 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png and b/res/drawable-xxhdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png index 34c889a79f5..fc60900710f 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png index dfd75697b0f..780b6397dc4 100644 Binary files a/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png and b/res/drawable-xxhdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-xxhdpi/ic_flag_white_24dp.png b/res/drawable-xxhdpi/ic_flag_white_24dp.png new file mode 100644 index 00000000000..fb2bc30ceb9 Binary files /dev/null and b/res/drawable-xxhdpi/ic_flag_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_gif_white_36dp.png b/res/drawable-xxhdpi/ic_gif_white_36dp.png new file mode 100644 index 00000000000..ae117123cf4 Binary files /dev/null and b/res/drawable-xxhdpi/ic_gif_white_36dp.png differ diff --git a/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png new file mode 100644 index 00000000000..c7d64b63524 Binary files /dev/null and b/res/drawable-xxhdpi/ic_hourglass_empty_white_18dp.png differ diff --git a/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png new file mode 100644 index 00000000000..4f5a2ecc388 Binary files /dev/null and b/res/drawable-xxhdpi/ic_hourglass_full_white_18dp.png differ diff --git a/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png new file mode 100644 index 00000000000..1c1676105c2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_lightbulb_outline_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_local_dining_white_24dp.png b/res/drawable-xxhdpi/ic_local_dining_white_24dp.png new file mode 100644 index 00000000000..8c43c1c2435 Binary files /dev/null and b/res/drawable-xxhdpi/ic_local_dining_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_menu_lock_dark.png b/res/drawable-xxhdpi/ic_menu_lock_dark.png new file mode 100644 index 00000000000..2090e9b25d4 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_lock_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_lock_holo_dark.png b/res/drawable-xxhdpi/ic_menu_lock_holo_dark.png deleted file mode 100644 index 07fc9bd590a..00000000000 Binary files a/res/drawable-xxhdpi/ic_menu_lock_holo_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_pets_white_24dp.png b/res/drawable-xxhdpi/ic_pets_white_24dp.png new file mode 100644 index 00000000000..6996e7cad44 Binary files /dev/null and b/res/drawable-xxhdpi/ic_pets_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_photo_library_white_24dp.png b/res/drawable-xxhdpi/ic_photo_library_white_24dp.png new file mode 100644 index 00000000000..497479291e6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_photo_library_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 00000000000..0311f899dd6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_play_circle_outline_white_48dp.png differ diff --git a/res/drawable-xxhdpi/ic_replay_white_24dp.png b/res/drawable-xxhdpi/ic_replay_white_24dp.png new file mode 100644 index 00000000000..fcddcf02ddb Binary files /dev/null and b/res/drawable-xxhdpi/ic_replay_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_security_white_24dp.png b/res/drawable-xxhdpi/ic_security_white_24dp.png new file mode 100644 index 00000000000..7bcb2fd013f Binary files /dev/null and b/res/drawable-xxhdpi/ic_security_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_share_white_24dp.png b/res/drawable-xxhdpi/ic_share_white_24dp.png new file mode 100644 index 00000000000..a35b3cd14af Binary files /dev/null and b/res/drawable-xxhdpi/ic_share_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png b/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png new file mode 100644 index 00000000000..4bfd7518672 Binary files /dev/null and b/res/drawable-xxhdpi/ic_tag_faces_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_text_fields_white_24dp.png b/res/drawable-xxhdpi/ic_text_fields_white_24dp.png new file mode 100644 index 00000000000..2d76a1da723 Binary files /dev/null and b/res/drawable-xxhdpi/ic_text_fields_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_timer_off_white_24dp.png b/res/drawable-xxhdpi/ic_timer_off_white_24dp.png new file mode 100644 index 00000000000..52e8dbdb311 Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_off_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_timer_white_24dp.png b/res/drawable-xxhdpi/ic_timer_white_24dp.png new file mode 100644 index 00000000000..bb6f9a63b5b Binary files /dev/null and b/res/drawable-xxhdpi/ic_timer_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_view_stream_white_24dp.png b/res/drawable-xxhdpi/ic_view_stream_white_24dp.png new file mode 100644 index 00000000000..b8656197f4b Binary files /dev/null and b/res/drawable-xxhdpi/ic_view_stream_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png b/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png new file mode 100644 index 00000000000..f0b22b6eff8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.png differ diff --git a/res/drawable-xxhdpi/ic_work_white_24dp.png b/res/drawable-xxhdpi/ic_work_white_24dp.png new file mode 100644 index 00000000000..af82415d5fd Binary files /dev/null and b/res/drawable-xxhdpi/ic_work_white_24dp.png differ diff --git a/res/drawable-xxhdpi/icon_cached.png b/res/drawable-xxhdpi/icon_cached.png new file mode 100644 index 00000000000..ac8c2958108 Binary files /dev/null and b/res/drawable-xxhdpi/icon_cached.png differ diff --git a/res/drawable-xxhdpi/poweredby_giphy.png b/res/drawable-xxhdpi/poweredby_giphy.png new file mode 100644 index 00000000000..aca5bf66145 Binary files /dev/null and b/res/drawable-xxhdpi/poweredby_giphy.png differ diff --git a/res/drawable-xxxhdpi-v11/icon_cached.png b/res/drawable-xxxhdpi-v11/icon_cached.png new file mode 100644 index 00000000000..fc6a8335472 Binary files /dev/null and b/res/drawable-xxxhdpi-v11/icon_cached.png differ diff --git a/res/drawable-xxxhdpi/ic_brush_white_24dp.png b/res/drawable-xxxhdpi/ic_brush_white_24dp.png new file mode 100644 index 00000000000..8297819ffd2 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_brush_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_check_white_36dp.png b/res/drawable-xxxhdpi/ic_check_white_36dp.png new file mode 100644 index 00000000000..bfd7b82aaa1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_check_white_36dp.png differ diff --git a/res/drawable-xxxhdpi/ic_check_white_48dp.png b/res/drawable-xxxhdpi/ic_check_white_48dp.png new file mode 100644 index 00000000000..23a197082a4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_check_white_48dp.png differ diff --git a/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png b/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png new file mode 100644 index 00000000000..b6b9ab51bd7 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_circle_fill_white_48dp.png differ diff --git a/res/drawable-xxxhdpi/ic_close_white_48dp.png b/res/drawable-xxxhdpi/ic_close_white_48dp.png new file mode 100644 index 00000000000..1ab2312754a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_close_white_48dp.png differ diff --git a/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png b/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png new file mode 100644 index 00000000000..817f274cfaf Binary files /dev/null and b/res/drawable-xxxhdpi/ic_dashboard_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png new file mode 100644 index 00000000000..b2c61c6bd1f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png new file mode 100644 index 00000000000..3196e256a6d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png new file mode 100644 index 00000000000..6745d84e543 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png new file mode 100644 index 00000000000..b2c61c6bd1f Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_activity_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png new file mode 100644 index 00000000000..dced7d63837 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png new file mode 100644 index 00000000000..678adf4d2d5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png new file mode 100644 index 00000000000..c69c5c3e825 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png new file mode 100644 index 00000000000..dced7d63837 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_flag_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png new file mode 100644 index 00000000000..39455b4fc55 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png new file mode 100644 index 00000000000..662dbac2b9a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png new file mode 100644 index 00000000000..c2b24323269 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png new file mode 100644 index 00000000000..39455b4fc55 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_foods_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png new file mode 100644 index 00000000000..e9106a7c4f4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png new file mode 100644 index 00000000000..9d3e7d4de7d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png new file mode 100644 index 00000000000..2e8d684359d Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png new file mode 100644 index 00000000000..e9106a7c4f4 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_nature_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png new file mode 100644 index 00000000000..841e9f12e75 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png new file mode 100644 index 00000000000..21bcb25ad1b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png new file mode 100644 index 00000000000..5541e5b8490 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png new file mode 100644 index 00000000000..841e9f12e75 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_object_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png new file mode 100644 index 00000000000..daa4020ce45 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png new file mode 100644 index 00000000000..eac554f5369 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png new file mode 100644 index 00000000000..e093154a75a Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png new file mode 100644 index 00000000000..daa4020ce45 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_people_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png new file mode 100644 index 00000000000..1953371c4db Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png new file mode 100644 index 00000000000..27f4935a32b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png new file mode 100644 index 00000000000..4088e500051 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png new file mode 100644 index 00000000000..1953371c4db Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_places_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png new file mode 100644 index 00000000000..062f031337b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png new file mode 100644 index 00000000000..eecad279338 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_activated_light.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png new file mode 100644 index 00000000000..86152fa2260 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png new file mode 100644 index 00000000000..062f031337b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_emoji_symbols_normal_light.png differ diff --git a/res/drawable-xxxhdpi/ic_flag_white_24dp.png b/res/drawable-xxxhdpi/ic_flag_white_24dp.png new file mode 100644 index 00000000000..41089527cab Binary files /dev/null and b/res/drawable-xxxhdpi/ic_flag_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_gif_white_36dp.png b/res/drawable-xxxhdpi/ic_gif_white_36dp.png new file mode 100644 index 00000000000..0ffbdb35542 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_gif_white_36dp.png differ diff --git a/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png b/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png new file mode 100644 index 00000000000..e2e2d74f594 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hourglass_empty_white_18dp.png differ diff --git a/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png b/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png new file mode 100644 index 00000000000..908b6a098a5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_hourglass_full_white_18dp.png differ diff --git a/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png b/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png new file mode 100644 index 00000000000..983a25340c2 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_lightbulb_outline_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png b/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png new file mode 100644 index 00000000000..8ad36ced7da Binary files /dev/null and b/res/drawable-xxxhdpi/ic_local_dining_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_menu_lock_dark.png b/res/drawable-xxxhdpi/ic_menu_lock_dark.png new file mode 100644 index 00000000000..22f75edfb9b Binary files /dev/null and b/res/drawable-xxxhdpi/ic_menu_lock_dark.png differ diff --git a/res/drawable-xxxhdpi/ic_pets_white_24dp.png b/res/drawable-xxxhdpi/ic_pets_white_24dp.png new file mode 100644 index 00000000000..f1fe74c154c Binary files /dev/null and b/res/drawable-xxxhdpi/ic_pets_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png b/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png new file mode 100644 index 00000000000..8627f427678 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_photo_library_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png b/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png new file mode 100644 index 00000000000..7a5a16858b0 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_play_circle_outline_white_48dp.png differ diff --git a/res/drawable-xxxhdpi/ic_replay_white_24dp.png b/res/drawable-xxxhdpi/ic_replay_white_24dp.png new file mode 100644 index 00000000000..1573fb111b5 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_replay_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_security_white_24dp.png b/res/drawable-xxxhdpi/ic_security_white_24dp.png new file mode 100644 index 00000000000..b1eddbd6c30 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_security_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_share_white_24dp.png b/res/drawable-xxxhdpi/ic_share_white_24dp.png new file mode 100644 index 00000000000..e351c7beb08 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_share_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png b/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png new file mode 100644 index 00000000000..319a13a3875 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_text_fields_white_24dp.png b/res/drawable-xxxhdpi/ic_text_fields_white_24dp.png new file mode 100644 index 00000000000..f4e597a8e2e Binary files /dev/null and b/res/drawable-xxxhdpi/ic_text_fields_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png b/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png new file mode 100644 index 00000000000..0b389438422 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_off_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_timer_white_24dp.png b/res/drawable-xxxhdpi/ic_timer_white_24dp.png new file mode 100644 index 00000000000..b8914c4a210 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_timer_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png b/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png new file mode 100644 index 00000000000..1e679697e97 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_view_stream_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png b/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png new file mode 100644 index 00000000000..97c34a0e006 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/ic_work_white_24dp.png b/res/drawable-xxxhdpi/ic_work_white_24dp.png new file mode 100644 index 00000000000..1bc11a8bbb1 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_work_white_24dp.png differ diff --git a/res/drawable-xxxhdpi/icon_cached.png b/res/drawable-xxxhdpi/icon_cached.png new file mode 100644 index 00000000000..07c7bd53828 Binary files /dev/null and b/res/drawable-xxxhdpi/icon_cached.png differ diff --git a/res/drawable-xxxhdpi/poweredby_giphy.png b/res/drawable-xxxhdpi/poweredby_giphy.png new file mode 100644 index 00000000000..f266ba65274 Binary files /dev/null and b/res/drawable-xxxhdpi/poweredby_giphy.png differ diff --git a/res/drawable/clickable_card_dark.xml b/res/drawable/clickable_card_dark.xml index 567ce86c346..5828c140657 100644 --- a/res/drawable/clickable_card_dark.xml +++ b/res/drawable/clickable_card_dark.xml @@ -6,5 +6,11 @@ + + + + + + diff --git a/res/drawable/clickable_card_light.xml b/res/drawable/clickable_card_light.xml index 68374a0b858..38211ea6e2b 100644 --- a/res/drawable/clickable_card_light.xml +++ b/res/drawable/clickable_card_light.xml @@ -6,5 +6,11 @@ + + + + + + diff --git a/res/drawable/compose_divider_background.xml b/res/drawable/compose_divider_background.xml new file mode 100644 index 00000000000..0046fe4e43a --- /dev/null +++ b/res/drawable/compose_divider_background.xml @@ -0,0 +1,8 @@ + + + + diff --git a/res/drawable/conversation_attachment_edit.xml b/res/drawable/conversation_attachment_edit.xml new file mode 100644 index 00000000000..4e3413c1cb1 --- /dev/null +++ b/res/drawable/conversation_attachment_edit.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/res/drawable/conversation_item_background.xml b/res/drawable/conversation_item_background.xml index 7014300913c..d4cbc9d8422 100644 --- a/res/drawable/conversation_item_background.xml +++ b/res/drawable/conversation_item_background.xml @@ -1,4 +1,5 @@ - \ No newline at end of file + + diff --git a/res/drawable/conversation_list_item_read_background.xml b/res/drawable/conversation_list_item_read_background.xml index 45108a5b760..8ad9fae3581 100644 --- a/res/drawable/conversation_list_item_read_background.xml +++ b/res/drawable/conversation_list_item_read_background.xml @@ -2,5 +2,6 @@ + - \ No newline at end of file + diff --git a/res/drawable/conversation_list_item_read_background_dark.xml b/res/drawable/conversation_list_item_read_background_dark.xml index c5153ed1888..237d729853e 100644 --- a/res/drawable/conversation_list_item_read_background_dark.xml +++ b/res/drawable/conversation_list_item_read_background_dark.xml @@ -2,5 +2,6 @@ + - \ No newline at end of file + diff --git a/res/drawable/conversation_list_item_unread_background.xml b/res/drawable/conversation_list_item_unread_background.xml index cede161f7cd..2f11d8cc992 100644 --- a/res/drawable/conversation_list_item_unread_background.xml +++ b/res/drawable/conversation_list_item_unread_background.xml @@ -2,5 +2,6 @@ + - \ No newline at end of file + diff --git a/res/drawable/conversation_list_item_unread_background_dark.xml b/res/drawable/conversation_list_item_unread_background_dark.xml index e6ae4638c87..bf0b92d2908 100644 --- a/res/drawable/conversation_list_item_unread_background_dark.xml +++ b/res/drawable/conversation_list_item_unread_background_dark.xml @@ -2,5 +2,6 @@ + - \ No newline at end of file + diff --git a/res/drawable/emoji_category_activity_dark.xml b/res/drawable/emoji_category_activity_dark.xml new file mode 100644 index 00000000000..84269ce568a --- /dev/null +++ b/res/drawable/emoji_category_activity_dark.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_activity_light.xml b/res/drawable/emoji_category_activity_light.xml new file mode 100644 index 00000000000..befeb3138df --- /dev/null +++ b/res/drawable/emoji_category_activity_light.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_flags_dark.xml b/res/drawable/emoji_category_flags_dark.xml new file mode 100644 index 00000000000..41416774f3e --- /dev/null +++ b/res/drawable/emoji_category_flags_dark.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_flags_light.xml b/res/drawable/emoji_category_flags_light.xml new file mode 100644 index 00000000000..2f61d042d20 --- /dev/null +++ b/res/drawable/emoji_category_flags_light.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_foods_dark.xml b/res/drawable/emoji_category_foods_dark.xml new file mode 100644 index 00000000000..650de4343a7 --- /dev/null +++ b/res/drawable/emoji_category_foods_dark.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_foods_light.xml b/res/drawable/emoji_category_foods_light.xml new file mode 100644 index 00000000000..475bd213526 --- /dev/null +++ b/res/drawable/emoji_category_foods_light.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/emoji_category_objects_dark.xml b/res/drawable/emoji_category_objects_dark.xml index 4ca7bc63558..3eb67ce51c3 100644 --- a/res/drawable/emoji_category_objects_dark.xml +++ b/res/drawable/emoji_category_objects_dark.xml @@ -1,7 +1,9 @@ - - + android:enterFadeDuration="200" + android:exitFadeDuration="300"> + + + + diff --git a/res/drawable/emoji_category_objects_light.xml b/res/drawable/emoji_category_objects_light.xml index 2db2e1438f4..83421c32c0d 100644 --- a/res/drawable/emoji_category_objects_light.xml +++ b/res/drawable/emoji_category_objects_light.xml @@ -1,7 +1,9 @@ - - + android:enterFadeDuration="200" + android:exitFadeDuration="300"> + + + + diff --git a/res/drawable/pause_icon.xml b/res/drawable/pause_icon.xml new file mode 100644 index 00000000000..e7f9fce53e8 --- /dev/null +++ b/res/drawable/pause_icon.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/pause_to_play_animation.xml b/res/drawable/pause_to_play_animation.xml new file mode 100644 index 00000000000..4d19dc4f9f6 --- /dev/null +++ b/res/drawable/pause_to_play_animation.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/play_icon.xml b/res/drawable/play_icon.xml new file mode 100644 index 00000000000..7472ac7de07 --- /dev/null +++ b/res/drawable/play_icon.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/play_to_pause_animation.xml b/res/drawable/play_to_pause_animation.xml new file mode 100644 index 00000000000..b8bc7934fe7 --- /dev/null +++ b/res/drawable/play_to_pause_animation.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/qr_code_background.xml b/res/drawable/qr_code_background.xml new file mode 100644 index 00000000000..a5266a706ed --- /dev/null +++ b/res/drawable/qr_code_background.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/res/drawable/reminder_background.xml b/res/drawable/reminder_background.xml new file mode 100644 index 00000000000..349f949c234 --- /dev/null +++ b/res/drawable/reminder_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/drawable/touch_highlight_background.xml b/res/drawable/touch_highlight_background.xml index de376e0b19e..8089a028086 100644 --- a/res/drawable/touch_highlight_background.xml +++ b/res/drawable/touch_highlight_background.xml @@ -1,5 +1,6 @@ + - \ No newline at end of file + diff --git a/res/drawable/vertical_separator.xml b/res/drawable/vertical_separator.xml new file mode 100644 index 00000000000..ac3f47aa349 --- /dev/null +++ b/res/drawable/vertical_separator.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/res/layout/attachment_type_selector.xml b/res/layout/attachment_type_selector.xml index 9b912d01226..93d90fdf92f 100644 --- a/res/layout/attachment_type_selector.xml +++ b/res/layout/attachment_type_selector.xml @@ -5,12 +5,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attachment_type_selector_background" - android:elevation="4dp" - android:padding="16dp"> + android:elevation="4dp"> + + - + + + + + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context="org.thoughtcrime.securesms.components.AudioView"> + tools:visibility="gone"/> + android:scaleType="centerInside" + tools:visibility="gone" + android:contentDescription="@string/audio_view__play_accessibility_description"/> + android:scaleType="centerInside" + android:contentDescription="@string/audio_view__pause_accessibility_description"/> + android:contentDescription="@string/audio_view__download_accessibility_description"/> diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml index 19003526f84..6738e2bace2 100644 --- a/res/layout/contact_filter_toolbar.xml +++ b/res/layout/contact_filter_toolbar.xml @@ -5,15 +5,6 @@ android:layout_height="match_parent" android:orientation="horizontal"> - - @@ -57,6 +47,7 @@ android:gravity="center_vertical" android:clickable="true" android:visibility="gone" + android:focusable="true" android:background="@drawable/circle_touch_highlight_background" android:src="@drawable/ic_keyboard_white_24dp" /> @@ -67,6 +58,7 @@ android:gravity="center_vertical" android:clickable="true" android:visibility="gone" + android:focusable="true" android:background="@drawable/circle_touch_highlight_background" android:src="@drawable/ic_clear_white_24dp" /> @@ -76,4 +68,4 @@ - \ No newline at end of file + diff --git a/res/layout/contact_selection_activity.xml b/res/layout/contact_selection_activity.xml index 26030dda906..709f7b65e64 100644 --- a/res/layout/contact_selection_activity.xml +++ b/res/layout/contact_selection_activity.xml @@ -3,7 +3,8 @@ android:layout_height="fill_parent" android:layout_width="fill_parent" android:orientation="vertical" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:theme="?attr/actionBarStyle"/> + android:layout_height="match_parent" + android:scrollbars="vertical" /> diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index ca51f733cf9..443e086c54a 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -40,19 +40,12 @@ android:background="?android:windowBackground" android:visibility="gone"> - - - + app:widgetBackground="@color/white" + app:foregroundTintColor="@color/grey_500" + app:backgroundTintColor="@color/white"/> - + @@ -85,6 +79,13 @@ android:text="@string/ConversationActivity_unblock" android:visibility="gone"/> +