Bump version to 3.5.2

// FREEBIE
Fix strange conversation draw behavior in GB
2026-02-15 15:37:29 +00:00 · 2015-11-24 12:08:13 -08:00 · 2015-11-24 11:47:50 -08:00 · 2015-11-23 12:03:14 -08:00 · 2015-11-23 12:03:00 -08:00 · 2015-11-23 11:49:57 -08:00
297 changed files with 9626 additions and 6473 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +0,0 @@
-language: android
-android:
-  components:
-    - platform-tools
-    - build-tools-19.1.0
-    - android-19
-    - extra-android-m2repository
--- a/.tx/config
+++ b/.tx/config
@@ -3,7 +3,7 @@ host = https://www.transifex.com
 lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in


-[textsecure-official.master]
+[signal-android.master]
 file_filter = res/values-<lang>/strings.xml
 source_file = res/values/strings.xml
 source_lang = en
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools"
          package="org.thoughtcrime.securesms"
-      android:versionCode="165"
-      android:versionName="3.3.2">
+      android:versionCode="172"
+      android:versionName="3.5.2">

    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>

@@ -131,12 +131,6 @@

    <activity android:name=".DeviceProvisioningActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="tsdevice"/>
-        </intent-filter>
    </activity>

    <activity android:name=".preferences.MmsPreferencesActivity"
@@ -233,6 +227,7 @@

    <activity android:name=".NewConversationActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".PushContactSelectionActivity"
@@ -265,7 +260,7 @@
    <activity android:name=".RegistrationProgressActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-     <activity android:name=".DeviceListActivity"
+     <activity android:name=".DeviceActivity"
               android:label="@string/AndroidManifest_manage_linked_devices"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

@@ -296,7 +291,7 @@
              android:finishOnTaskLaunch="true" />

    <activity android:name=".PlayServicesProblemActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:theme="@style/TextSecure.DialogActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".SmsSendtoActivity">
@@ -317,6 +312,19 @@
        </intent-filter>
    </activity>

+    <activity android:name="org.thoughtcrime.redphone.RedPhoneShare"
+              android:theme="@style/NoAnimation.Theme.BlackScreen"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
+        </intent-filter>
+
+    </activity>
+
    <activity android:name=".RecipientPreferenceActivity"
              android:theme="@style/TextSecure.LightNoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ If you're interested in a life of peace and tranquility, stick with the standard
 ## Contributing Translations
 Interested in helping to translate Signal? Contribute here:

-https://www.transifex.com/projects/p/textsecure-official/
+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).
@@ -45,7 +45,7 @@ whispersystems@lists.riseup.net
 https://lists.riseup.net/www/info/whispersystems

 ## Contributing Funds
-[![Donate](https://www.coinbase.com/assets/buttons/donation_large-5e1b50d6490970e32b80023f3070b1d77afc621b9e64ac996596a67a4671967b.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
+[![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.

--- a/build.gradle
+++ b/build.gradle
@@ -29,12 +29,6 @@ repositories {
    maven { // textdrawable
        url 'https://dl.bintray.com/amulyakhare/maven'
    }
-    maven { // material-dialogs
-        url "https://jitpack.io"
-    }
-    maven { // cwac-camera
-      url 'https://repo.commonsware.com.s3.amazonaws.com'
-    }
    jcenter()
    mavenLocal()
 }
@@ -51,16 +45,12 @@ dependencies {
    compile 'com.makeramen:roundedimageview:2.1.0'
    compile 'com.pnikosis:materialish-progress:1.5'
    compile 'de.greenrobot:eventbus:2.4.0'
-    compile ('com.afollestad:material-dialogs:0.7.3.1') {
-        exclude module: 'appcompat-v7'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'support-annotations'
-    }
-
    compile 'pl.tajchert:waitingdots:0.1.0'
    compile 'com.soundcloud.android:android-crop:0.9.10@aar'
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile 'com.android.support:recyclerview-v7:21.0.3'
+    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:recyclerview-v7:22.2.1'
+    compile 'com.android.support:design:22.2.1'
+    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'){
@@ -75,14 +65,14 @@ dependencies {
        exclude group: 'com.android.support', module: 'support-v4'
    }
    compile 'com.madgag.spongycastle:prov:1.51.0.0'
-    compile 'com.commonsware.cwac:camera:0.6.12'
    provided 'com.squareup.dagger:dagger-compiler:1.2.2'

    compile 'org.whispersystems:jobmanager:1.0.2'
    compile 'org.whispersystems:libpastelog:1.0.6'
    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'org.whispersystems:textsecure-android:1.8.1'
+    compile 'org.whispersystems:textsecure-android:1.8.3'
    compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0'
+    compile 'com.google.zxing:core:3.2.1'

    testCompile 'junit:junit:4.12'
    testCompile 'org.assertj:assertj-core:1.7.1'
@@ -116,11 +106,12 @@ dependencyVerification {
            'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1',
            'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54',
            'de.greenrobot:eventbus:61d743a748156a372024d083de763b9e91ac2dcb3f6a1cbc74995c7ddab6e968',
-            'com.afollestad:material-dialogs:624dffff240533ca69414464f416c81c88c5c29689bb169093b9a333104f2471',
            'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
            'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
-            'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96',
-            'com.android.support:recyclerview-v7:e525ad3f33c84bb12b73d2dc975b55364a53f0f2d0697e043efba59ba73e22d2',
+            'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618',
+            'com.android.support:recyclerview-v7:b0f530a5b14334d56ce0de85527ffe93ac419bc928e2884287ce1dddfedfb505',
+            'com.android.support:design:58be3ca6a73789615f7ece0937d2f683b98b594bb90aa10565fa760fb10b07ee',
+            'com.android.support:cardview-v7:2c2354761a4e20ba451ae903ab808f15c9acc8343b1e74001869c2d0a672c1fc',
            'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
            'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
            'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
@@ -128,18 +119,19 @@ dependencyVerification {
            'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
            'com.doomonafireball.betterpickers:library:132ecd685c95a99e7377c4e27bfadbb2d7ed0bea995944060cd62d4369fdaf3d',
            'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
-            'com.commonsware.cwac:camera:dcc93ddbb2f0393114fa1f31a13fe9e6edfcf5dbe96b22bc4b66c7b15e179054',
            'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
            'org.whispersystems:libpastelog:550d33c565380d90f4c671e7b8ed5f3a6da55a9fda468373177106b2eb5220b2',
            'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
-            'org.whispersystems:textsecure-android:66ef91b93a08f0a290ef14c5e66af21113cd4b2c814c231855011ba4763f41cc',
+            'org.whispersystems:textsecure-android:aec5fc59952d9f5482491091091687816f46be1144342a0244f48fd55d6ab393',
            'com.h6ah4i.android.compat:mulsellistprefcompat:47167c5cb796de1a854788e9ff318358e36c8fb88123baaa6e38fb78511dfabe',
+            'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
+            'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
            'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
            'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
            'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-            'org.whispersystems:textsecure-java:728a549830266cc1472054f400391cd946b25ea03ad76ac4839dd1cab626a247',
+            'org.whispersystems:textsecure-java:b407ca6d1430204dfabf38e27db22d5177409072a9668238bd1877de7676ad3f',
            'org.whispersystems:axolotl-android:40d3db5004a84749a73f68d2f0d01b2ae35a73c54df96d8c6c6723b96efb6fc0',
-            'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab',
+            'com.googlecode.libphonenumber:libphonenumber:9625de9d2270e9a280ff4e6d9ef3106573fb4828773fd32c9b7614f4e17d2811',
            'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
            'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af',
            'com.fasterxml.jackson.core:jackson-databind:835097bcdd11f5bc8a08378c70d4c8054dfa4b911691cc2752063c75534d198d',
@@ -149,8 +141,7 @@ dependencyVerification {
            'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
            'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
            'org.whispersystems:curve25519-java:9ccef8f5aba05d9942336f023c589d6278b4f9135bdc34a7bade1f4e7ad65fa3',
-            'com.android.support:support-v4:1e2e4d35ac7fd30db5ce3bc177b92e4d5af86acef2ef93e9221599d733346f56',
-            'com.android.support:support-annotations:7bc07519aa613b186001160403bcfd68260fa82c61cc7e83adeedc9b862b94ae',
+            'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423',
    ]
 }

--- a/contributing.md
+++ b/contributing.md
@@ -28,4 +28,4 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.** Protocol ideas that require synchronized
   clocks are doomed to failure. 

-Before you submit a pull request, please check if your code follows the [Code style Guidelines](https://github.com/WhisperSystems/RedPhone/wiki/Code-style-Guidelines).
+Before you submit a pull request, please check if your code follows the [Code style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).
--- a/res/drawable-hdpi/ic_add_white_original_24dp.png
+++ b/res/drawable-hdpi/ic_add_white_original_24dp.png
--- a/res/drawable-hdpi/ic_call_end_grey600_32dp.png
+++ b/res/drawable-hdpi/ic_call_end_grey600_32dp.png
--- a/res/drawable-hdpi/ic_close_grey600_32dp.png
+++ b/res/drawable-hdpi/ic_close_grey600_32dp.png
--- a/res/drawable-hdpi/ic_devices_white.png
+++ b/res/drawable-hdpi/ic_devices_white.png
--- a/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
+++ b/res/drawable-hdpi/ic_keyboard_arrow_left_grey600_24dp.png
--- a/res/drawable-hdpi/ic_laptop_black_32dp.png
+++ b/res/drawable-hdpi/ic_laptop_black_32dp.png
--- a/res/drawable-hdpi/ic_laptop_light_32dp.png
+++ b/res/drawable-hdpi/ic_laptop_light_32dp.png
--- a/res/drawable-hdpi/ic_mic_grey600_24dp.png
+++ b/res/drawable-hdpi/ic_mic_grey600_24dp.png
--- a/res/drawable-hdpi/ic_mic_white_24dp.png
+++ b/res/drawable-hdpi/ic_mic_white_24dp.png
--- a/res/drawable-hdpi/ic_mic_white_48dp.png
+++ b/res/drawable-hdpi/ic_mic_white_48dp.png
--- a/res/drawable-hdpi/ic_phone_grey600_32dp.png
+++ b/res/drawable-hdpi/ic_phone_grey600_32dp.png
--- a/res/drawable-hdpi/ic_signal_grey_24dp.png
+++ b/res/drawable-hdpi/ic_signal_grey_24dp.png
--- a/res/drawable-hdpi/ic_signal_white_48dp.png
+++ b/res/drawable-hdpi/ic_signal_white_48dp.png
--- a/res/drawable-hdpi/ic_visibility_grey600_24dp.png
+++ b/res/drawable-hdpi/ic_visibility_grey600_24dp.png
--- a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
+++ b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
--- a/res/drawable-hdpi/ic_visibility_off_white_24dp.png
+++ b/res/drawable-hdpi/ic_visibility_off_white_24dp.png
--- a/res/drawable-hdpi/ic_visibility_white_24dp.png
+++ b/res/drawable-hdpi/ic_visibility_white_24dp.png
--- a/res/drawable-hdpi/redphone_stat_sys_phone_call.png
+++ b/res/drawable-hdpi/redphone_stat_sys_phone_call.png
--- a/res/drawable-mdpi/ic_add_white_original_24dp.png
+++ b/res/drawable-mdpi/ic_add_white_original_24dp.png
--- a/res/drawable-mdpi/ic_call_end_grey600_32dp.png
+++ b/res/drawable-mdpi/ic_call_end_grey600_32dp.png
--- a/res/drawable-mdpi/ic_close_grey600_32dp.png
+++ b/res/drawable-mdpi/ic_close_grey600_32dp.png
--- a/res/drawable-mdpi/ic_devices_white.png
+++ b/res/drawable-mdpi/ic_devices_white.png
--- a/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
+++ b/res/drawable-mdpi/ic_keyboard_arrow_left_grey600_24dp.png
--- a/res/drawable-mdpi/ic_laptop_black_32dp.png
+++ b/res/drawable-mdpi/ic_laptop_black_32dp.png
--- a/res/drawable-mdpi/ic_laptop_light_32dp.png
+++ b/res/drawable-mdpi/ic_laptop_light_32dp.png
--- a/res/drawable-mdpi/ic_mic_grey600_24dp.png
+++ b/res/drawable-mdpi/ic_mic_grey600_24dp.png
--- a/res/drawable-mdpi/ic_mic_white_24dp.png
+++ b/res/drawable-mdpi/ic_mic_white_24dp.png
--- a/res/drawable-mdpi/ic_mic_white_48dp.png
+++ b/res/drawable-mdpi/ic_mic_white_48dp.png
--- a/res/drawable-mdpi/ic_phone_grey600_32dp.png
+++ b/res/drawable-mdpi/ic_phone_grey600_32dp.png
--- a/res/drawable-mdpi/ic_signal_grey_24dp.png
+++ b/res/drawable-mdpi/ic_signal_grey_24dp.png
--- a/res/drawable-mdpi/ic_signal_white_48dp.png
+++ b/res/drawable-mdpi/ic_signal_white_48dp.png
--- a/res/drawable-mdpi/ic_visibility_grey600_24dp.png
+++ b/res/drawable-mdpi/ic_visibility_grey600_24dp.png
--- a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
+++ b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
--- a/res/drawable-mdpi/ic_visibility_off_white_24dp.png
+++ b/res/drawable-mdpi/ic_visibility_off_white_24dp.png
--- a/res/drawable-mdpi/ic_visibility_white_24dp.png
+++ b/res/drawable-mdpi/ic_visibility_white_24dp.png
--- a/res/drawable-mdpi/redphone_stat_sys_phone_call.png
+++ b/res/drawable-mdpi/redphone_stat_sys_phone_call.png
--- a/res/drawable-v12/recycler_view_fast_scroller_bubble.xml
+++ b/res/drawable-v12/recycler_view_fast_scroller_bubble.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:topLeftRadius="44dp"
+             android:topRightRadius="44dp"
+             android:bottomLeftRadius="44dp"
+             android:bottomRightRadius="0dp"/>
+    <solid android:color="#FF0288D1" />
+    <size android:height="88dp" android:width="88dp" />
+</shape>
--- a/res/drawable-xhdpi/ic_add_white_original_24dp.png
+++ b/res/drawable-xhdpi/ic_add_white_original_24dp.png
--- a/res/drawable-xhdpi/ic_call_end_grey600_32dp.png
+++ b/res/drawable-xhdpi/ic_call_end_grey600_32dp.png
--- a/res/drawable-xhdpi/ic_close_grey600_32dp.png
+++ b/res/drawable-xhdpi/ic_close_grey600_32dp.png
--- a/res/drawable-xhdpi/ic_devices_white.png
+++ b/res/drawable-xhdpi/ic_devices_white.png
--- a/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
+++ b/res/drawable-xhdpi/ic_keyboard_arrow_left_grey600_24dp.png
--- a/res/drawable-xhdpi/ic_laptop_black_32dp.png
+++ b/res/drawable-xhdpi/ic_laptop_black_32dp.png
--- a/res/drawable-xhdpi/ic_laptop_light_32dp.png
+++ b/res/drawable-xhdpi/ic_laptop_light_32dp.png
--- a/res/drawable-xhdpi/ic_mic_grey600_24dp.png
+++ b/res/drawable-xhdpi/ic_mic_grey600_24dp.png
--- a/res/drawable-xhdpi/ic_mic_white_24dp.png
+++ b/res/drawable-xhdpi/ic_mic_white_24dp.png
--- a/res/drawable-xhdpi/ic_mic_white_48dp.png
+++ b/res/drawable-xhdpi/ic_mic_white_48dp.png
--- a/res/drawable-xhdpi/ic_phone_grey600_32dp.png
+++ b/res/drawable-xhdpi/ic_phone_grey600_32dp.png
--- a/res/drawable-xhdpi/ic_signal_grey_24dp.png
+++ b/res/drawable-xhdpi/ic_signal_grey_24dp.png
--- a/res/drawable-xhdpi/ic_signal_white_48dp.png
+++ b/res/drawable-xhdpi/ic_signal_white_48dp.png
--- a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
+++ b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
--- a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
+++ b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
--- a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
+++ b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
--- a/res/drawable-xhdpi/ic_visibility_white_24dp.png
+++ b/res/drawable-xhdpi/ic_visibility_white_24dp.png
--- a/res/drawable-xhdpi/redphone_stat_sys_phone_call.png
+++ b/res/drawable-xhdpi/redphone_stat_sys_phone_call.png
--- a/res/drawable-xxhdpi/ic_add_white_original_24dp.png
+++ b/res/drawable-xxhdpi/ic_add_white_original_24dp.png
--- a/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png
+++ b/res/drawable-xxhdpi/ic_call_end_grey600_32dp.png
--- a/res/drawable-xxhdpi/ic_close_grey600_32dp.png
+++ b/res/drawable-xxhdpi/ic_close_grey600_32dp.png
--- a/res/drawable-xxhdpi/ic_devices_white.png
+++ b/res/drawable-xxhdpi/ic_devices_white.png
--- a/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
+++ b/res/drawable-xxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
--- a/res/drawable-xxhdpi/ic_laptop_black_32dp.png
+++ b/res/drawable-xxhdpi/ic_laptop_black_32dp.png
--- a/res/drawable-xxhdpi/ic_laptop_light_32dp.png
+++ b/res/drawable-xxhdpi/ic_laptop_light_32dp.png
--- a/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
+++ b/res/drawable-xxhdpi/ic_mic_grey600_24dp.png
--- a/res/drawable-xxhdpi/ic_mic_white_24dp.png
+++ b/res/drawable-xxhdpi/ic_mic_white_24dp.png
--- a/res/drawable-xxhdpi/ic_mic_white_48dp.png
+++ b/res/drawable-xxhdpi/ic_mic_white_48dp.png
--- a/res/drawable-xxhdpi/ic_phone_grey600_32dp.png
+++ b/res/drawable-xxhdpi/ic_phone_grey600_32dp.png
--- a/res/drawable-xxhdpi/ic_signal_grey_24dp.png
+++ b/res/drawable-xxhdpi/ic_signal_grey_24dp.png
--- a/res/drawable-xxhdpi/ic_signal_white_48dp.png
+++ b/res/drawable-xxhdpi/ic_signal_white_48dp.png
--- a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
+++ b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
--- a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
+++ b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
--- a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
+++ b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
--- a/res/drawable-xxhdpi/ic_visibility_white_24dp.png
+++ b/res/drawable-xxhdpi/ic_visibility_white_24dp.png
--- a/res/drawable-xxhdpi/redphone_stat_sys_phone_call.png
+++ b/res/drawable-xxhdpi/redphone_stat_sys_phone_call.png
--- a/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
+++ b/res/drawable-xxxhdpi/ic_add_white_original_24dp.png
--- a/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png
+++ b/res/drawable-xxxhdpi/ic_call_end_grey600_32dp.png
--- a/res/drawable-xxxhdpi/ic_close_grey600_32dp.png
+++ b/res/drawable-xxxhdpi/ic_close_grey600_32dp.png
--- a/res/drawable-xxxhdpi/ic_devices_white.png
+++ b/res/drawable-xxxhdpi/ic_devices_white.png
--- a/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
+++ b/res/drawable-xxxhdpi/ic_keyboard_arrow_left_grey600_24dp.png
--- a/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
+++ b/res/drawable-xxxhdpi/ic_mic_grey600_24dp.png
--- a/res/drawable-xxxhdpi/ic_mic_white_24dp.png
+++ b/res/drawable-xxxhdpi/ic_mic_white_24dp.png
--- a/res/drawable-xxxhdpi/ic_mic_white_48dp.png
+++ b/res/drawable-xxxhdpi/ic_mic_white_48dp.png
--- a/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png
+++ b/res/drawable-xxxhdpi/ic_phone_grey600_32dp.png
--- a/res/drawable-xxxhdpi/ic_signal_grey_24dp.png
+++ b/res/drawable-xxxhdpi/ic_signal_grey_24dp.png
--- a/res/drawable-xxxhdpi/ic_signal_white_48dp.png
+++ b/res/drawable-xxxhdpi/ic_signal_white_48dp.png
--- a/res/drawable/recycler_view_fast_scroller_bubble.xml
+++ b/res/drawable/recycler_view_fast_scroller_bubble.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:topLeftRadius="44dp"
+             android:topRightRadius="44dp"
+             android:bottomLeftRadius="0dp"
+             android:bottomRightRadius="44dp"/>
+    <solid android:color="#FF0288D1" />
+    <size android:height="88dp" android:width="88dp" />
+</shape>
--- a/res/drawable/recycler_view_fast_scroller_handle.xml
+++ b/res/drawable/recycler_view_fast_scroller_handle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+            <corners android:radius="2dp"/>
+            <solid android:color="#FF0288D1"/>
+            <size android:height="32dp" android:width="4dp"/>
+        </shape>
+    </item>
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+            <corners android:radius="2dp"/>
+            <solid android:color="#FF737373"/>
+            <size android:height="32dp" android:width="4dp"/>
+        </shape>
+    </item>
+</selector>
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -3,13 +3,11 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-            android:fillViewport="true"
-            android:background="@drawable/background_pattern_repeat">
+            android:fillViewport="true">

-    <FrameLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center" >
+    <FrameLayout android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:gravity="center">
        
        <LinearLayout android:paddingRight="16dip"
                      android:paddingLeft="16dip"
@@ -20,40 +18,45 @@
                      android:visibility="visible"
                      android:orientation="vertical">
                
-            <TextView style="@style/Registration.Label"
-                      android:id="@+id/old_passphrase_label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__old_passphrase" />
-            
-            <EditText android:id="@+id/old_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:layout_marginBottom="10dip"
-                      android:singleLine="true"/>
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">

-            <TextView style="@style/Registration.Label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__new_passphrase" />
-            
-            <EditText android:id="@+id/new_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:singleLine="true"/>
+                <EditText android:id="@+id/old_passphrase"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:layout_marginBottom="10dip"
+                          android:hint="@string/change_passphrase_activity__old_passphrase"
+                          android:singleLine="true"/>

-           <TextView style="@style/Registration.Label"
-                      android:layout_width="fill_parent"
-                      android:textAllCaps="true"
-                      android:text="@string/change_passphrase_activity__repeat_new_passphrase" />
-            
-            <EditText android:id="@+id/repeat_passphrase"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:inputType="textPassword"
-                      android:singleLine="true"/>
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText android:id="@+id/new_passphrase"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:hint="@string/change_passphrase_activity__new_passphrase"
+                          android:singleLine="true"/>
+
+            </android.support.design.widget.TextInputLayout>
+
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <EditText android:id="@+id/repeat_passphrase"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="textPassword"
+                          android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
+                          android:singleLine="true" />
+
+            </android.support.design.widget.TextInputLayout>

            <LinearLayout android:orientation="horizontal"
                          android:layout_width="fill_parent"
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -36,6 +36,8 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                android:gravity="center">

                <ImageView android:id="@+id/search_dialpad"
--- a/res/layout/contact_selection_list_fragment.xml
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -1,5 +1,5 @@

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">
@@ -9,8 +9,8 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <se.emilsjolander.stickylistheaders.StickyListHeadersListView
-            android:id="@android:id/list"
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recycler_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

@@ -23,4 +23,12 @@
            android:textSize="20sp" />

    </android.support.v4.widget.SwipeRefreshLayout>
-</LinearLayout>
+
+    <org.thoughtcrime.securesms.components.RecyclerViewFastScroller
+        android:id="@+id/fast_scroller"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:layout_gravity="right"/>
+
+</FrameLayout>
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -1,72 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>

 <org.thoughtcrime.securesms.contacts.ContactSelectionListItem
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/listPreferredItemHeight"
-                android:paddingRight="50dp">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@drawable/conversation_list_item_background"
+        android:paddingLeft="48dp"
+        android:paddingRight="20dp">

    <org.thoughtcrime.securesms.components.AvatarImageView
            android:id="@+id/contact_photo_image"
-            android:layout_width="@dimen/contact_selection_photo_size"
-            android:layout_height="@dimen/contact_selection_photo_size"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
            android:foreground="@drawable/contact_photo_background"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="10dp"
            android:cropToPadding="true"
+            tools:src="@color/md_material_blue_600"
+            android:layout_marginRight="10dp"
            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />

-    <LinearLayout
-            android:id="@+id/number_container"
-            android:orientation="horizontal"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dip"
-            android:layout_marginLeft="14dip"
-            android:layout_alignParentBottom="true"
-            android:layout_toRightOf="@id/contact_photo_image">
-
-        <TextView android:id="@+id/number"
-                  android:layout_width="wrap_content"
+    <LinearLayout android:layout_width="0dp"
                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:ellipsize="marquee"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:fontFamily="sans-serif-light" />
+                  android:layout_weight="1"
+                  android:orientation="vertical">
+
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textSize="16sp"
+                tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
+
+        <LinearLayout android:id="@+id/number_container"
+                      android:orientation="horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content">
+
+            <TextView android:id="@+id/number"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:ellipsize="marquee"
+                      android:textAppearance="?android:attr/textAppearanceSmall"
+                      android:textSize="14sp"
+                      android:fontFamily="sans-serif-light"
+                      tools:text="+1 (555) 555-5555" />
+
+            <TextView android:id="@+id/label"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:paddingLeft="10dip"
+                      android:ellipsize="end"
+                      android:singleLine="true"
+                      android:textAppearance="?android:attr/textAppearanceSmall"
+                      android:fontFamily="sans-serif-light"
+                      tools:text="Mobile" />
+
+        </LinearLayout>

-        <TextView android:id="@+id/label"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="10dip"
-                  android:ellipsize="end"
-                  android:singleLine="true"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:fontFamily="sans-serif-light"/>

    </LinearLayout>

-    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-        android:id="@+id/name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/number_container"
-        android:layout_alignParentTop="true"
-        android:layout_marginBottom="1dip"
-        android:layout_marginLeft="14dip"
-	    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:layout_toRightOf="@id/contact_photo_image"
-        android:gravity="center_vertical|left"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
    <CheckBox android:id="@+id/check_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="13dp"
-        android:focusable="false"
-        android:clickable="false" />
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_vertical"
+              android:focusable="false"
+              android:clickable="false" />

 </org.thoughtcrime.securesms.contacts.ContactSelectionListItem>
--- a/res/layout/contact_selection_recyclerview_header.xml
+++ b/res/layout/contact_selection_recyclerview_header.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:layout_width="48dp"
+          android:layout_height="?android:attr/listPreferredItemHeight"
+          android:gravity="center"
+          android:textColor="#666"
+          android:textSize="22sp"
+          tools:text="H" />
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -14,11 +14,14 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

-    <LinearLayout android:layout_width="match_parent"
+    <LinearLayout android:id="@+id/conversation_container"
+                  android:layout_width="match_parent"
                  android:layout_height="match_parent"
                  android:orientation="vertical"
                  android:paddingTop="?attr/actionBarSize"
-                  android:gravity="bottom">
+                  android:gravity="bottom"
+                  android:clipToPadding="false"
+                  android:clipChildren="false">

        <org.thoughtcrime.securesms.components.reminder.ReminderView
            android:id="@+id/reminder"
@@ -66,80 +69,7 @@

        </FrameLayout>

-        <LinearLayout android:id="@+id/bottom_panel"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:gravity="center_vertical"
-                      android:orientation="horizontal"
-                      android:clickable="true"
-                      android:background="?android:windowBackground"
-                      android:padding="5dp">
-
-            <LinearLayout android:id="@+id/compose_bubble"
-                          android:layout_width="0dp"
-                          android:layout_height="wrap_content"
-                          android:layout_weight="1"
-                          android:background="@drawable/sent_bubble">
-
-                <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                        android:id="@+id/emoji_toggle"
-                        android:layout_width="37dp"
-                        android:layout_height="37dp"
-                        android:layout_gravity="bottom"
-                        android:background="@drawable/touch_highlight_background"
-                        android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
-
-                <org.thoughtcrime.securesms.components.ComposeText
-                        style="@style/ComposeEditText"
-                        android:id="@+id/embedded_text_editor"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:minHeight="37dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:nextFocusForward="@+id/send_button"
-                        android:nextFocusRight="@+id/send_button"
-                        tools:hint="Send TextSecure message" />
-
-                <org.thoughtcrime.securesms.components.camera.HidingImageButton
-                        android:id="@+id/quick_attachment_toggle"
-                        android:layout_width="37dp"
-                        android:layout_height="37dp"
-                        android:layout_gravity="bottom"
-                        android:src="?quick_camera_icon"
-                        android:background="@drawable/touch_highlight_background"
-                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
-                        android:padding="10dp" />
-            </LinearLayout>
-
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@drawable/circle_tintable"
-                    android:layout_gravity="bottom">
-
-                <ImageButton android:id="@+id/attach_button"
-                             android:layout_width="match_parent"
-                             android:layout_height="match_parent"
-                             android:layout_gravity="center"
-                             android:background="@drawable/circle_touch_highlight_background"
-                             android:src="@drawable/ic_attach_white_24dp"
-                             android:contentDescription="@string/ConversationActivity_add_attachment"
-                             android:nextFocusLeft="@+id/embedded_text_editor" />
-
-                <org.thoughtcrime.securesms.components.SendButton
-                        android:id="@+id/send_button"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/conversation_activity__send"
-                        android:nextFocusLeft="@+id/embedded_text_editor"
-                        android:src="?conversation_transport_sms_indicator"
-                        android:background="@drawable/circle_touch_highlight_background" />
-
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-        </LinearLayout>
+        <include layout="@layout/conversation_input_panel"/>

        <Button android:id="@+id/unblock_button"
                android:layout_width="fill_parent"
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto"
+       xmlns:tools="http://schemas.android.com/tools">
+
+<org.thoughtcrime.securesms.components.InputPanel
+        android:id="@+id/bottom_panel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:clickable="true"
+        android:background="?android:windowBackground"
+        android:padding="5dp"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+    <FrameLayout android:layout_width="0dp"
+                 android:layout_height="wrap_content"
+                 android:layout_weight="1"
+                 android:clipChildren="false"
+                 android:clipToPadding="false">
+
+        <LinearLayout android:id="@+id/compose_bubble"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:background="@drawable/sent_bubble"
+                      android:clipChildren="false"
+                      android:clipToPadding="false">
+
+            <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                    android:id="@+id/emoji_toggle"
+                    android:layout_width="37dp"
+                    android:layout_height="37dp"
+                    android:layout_gravity="bottom"
+                    android:background="@drawable/touch_highlight_background"
+                    android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
+
+            <org.thoughtcrime.securesms.components.ComposeText
+                    style="@style/ComposeEditText"
+                    android:id="@+id/embedded_text_editor"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:minHeight="37dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:nextFocusForward="@+id/send_button"
+                    android:nextFocusRight="@+id/send_button"
+                    tools:visibility="invisible"
+                    tools:hint="Send TextSecure message" >
+                <requestFocus />
+            </org.thoughtcrime.securesms.components.ComposeText>
+
+            <org.thoughtcrime.securesms.components.HidingLinearLayout
+                    android:id="@+id/quick_attachment_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clipChildren="false"
+                    android:clipToPadding="false">
+
+                <ImageButton
+                        android:id="@+id/quick_camera_toggle"
+                        android:layout_width="37dp"
+                        android:layout_height="37dp"
+                        android:layout_gravity="bottom"
+                        android:src="?quick_camera_icon"
+                        android:background="@drawable/touch_highlight_background"
+                        android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
+                        android:padding="10dp"/>
+
+                <org.thoughtcrime.securesms.components.MicrophoneRecorderView
+                        android:id="@+id/recorder_view"
+                        android:layout_width="37dp"
+                        android:layout_height="37dp"
+                        android:clipChildren="false"
+                        android:clipToPadding="false">
+
+                    <ImageButton
+                            android:id="@+id/quick_audio_toggle"
+                            android:layout_width="37dp"
+                            android:layout_height="37dp"
+                            android:layout_gravity="bottom"
+                            android:src="?quick_mic_icon"
+                            android:background="@null"
+                            android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
+                            android:padding="10dp"/>
+
+                    <ImageView android:id="@+id/quick_audio_fab"
+                               android:layout_width="74dp"
+                               android:layout_height="74dp"
+                               android:src="@drawable/ic_mic_white_48dp"
+                               android:background="@drawable/circle_tintable"
+                               android:backgroundTint="@color/red_400"
+                               android:visibility="gone"
+                               android:scaleType="center"/>
+
+                </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
+
+            </org.thoughtcrime.securesms.components.HidingLinearLayout>
+        </LinearLayout>
+
+        <LinearLayout android:id="@+id/recording_container"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:layout_gravity="center_vertical"
+                      android:orientation="horizontal">
+
+            <TextView android:id="@+id/record_time"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:ellipsize="none"
+                      android:layout_marginLeft="20dp"
+                      android:text="00:00"
+                      android:textColor="#61737b"
+                      android:textSize="20dp"
+                      android:singleLine="true"
+                      android:visibility="gone"
+                      tools:visibility="visible"/>
+
+            <FrameLayout android:layout_width="match_parent"
+                         android:layout_height="match_parent"
+                         android:clipChildren="true">
+
+                <TextView android:id="@+id/slide_to_cancel"
+                          android:layout_width="wrap_content"
+                          android:layout_height="match_parent"
+                          android:gravity="center"
+                          android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
+                          android:text="@string/conversation_input_panel__slide_to_cancel"
+                          android:textAllCaps="true"
+                          android:textColor="#61737b"
+                          android:textSize="10sp"
+                          android:ellipsize="none"
+                          android:singleLine="true"
+                          android:paddingLeft="20dp"
+                          android:visibility="gone"
+                          tools:visibility="visible"/>
+
+            </FrameLayout>
+
+        </LinearLayout>
+
+    </FrameLayout>
+    <org.thoughtcrime.securesms.components.AnimatingToggle
+            android:id="@+id/button_toggle"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:background="@drawable/circle_tintable"
+            android:layout_gravity="bottom">
+
+        <ImageButton android:id="@+id/attach_button"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent"
+                     android:layout_gravity="center"
+                     android:background="@drawable/circle_touch_highlight_background"
+                     android:src="@drawable/ic_attach_white_24dp"
+                     android:contentDescription="@string/ConversationActivity_add_attachment"
+                     android:nextFocusLeft="@+id/embedded_text_editor" />
+
+        <org.thoughtcrime.securesms.components.SendButton
+                android:id="@+id/send_button"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/conversation_activity__send"
+                android:nextFocusLeft="@+id/embedded_text_editor"
+                android:src="?conversation_transport_sms_indicator"
+                android:background="@drawable/circle_touch_highlight_background" />
+
+    </org.thoughtcrime.securesms.components.AnimatingToggle>
+</org.thoughtcrime.securesms.components.InputPanel>
+</merge>
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -83,7 +83,7 @@
                app:backgroundColorHint="?conversation_background"
                android:visibility="gone"
                tools:src="@drawable/ic_video_light"
-                tools:visibility="visible"                />
+                tools:visibility="visible" />

        <TextView android:id="@id/date"
                  android:layout_marginLeft="3dip"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Moxie Marlinspike	e4e8511b4c	Bump version to 3.5.2 // FREEBIE	2015-11-24 12:08:13 -08:00
Moxie Marlinspike	13328ca0d0	Fix strange conversation draw behavior in GB // FREEBIE	2015-11-24 11:47:50 -08:00
Moxie Marlinspike	6a188248a7	Bump version to 3.5.1 // FREEBIE	2015-11-23 12:03:14 -08:00
Moxie Marlinspike	5e493c90f8	Fix broken strings // FREEBIE	2015-11-23 12:03:00 -08:00
Moxie Marlinspike	8e735cd66f	Update language translations // FREEBIE	2015-11-23 11:49:57 -08:00
Moxie Marlinspike	885fc88aad	Disable voice messages until iOS gets their act together // FREEBIE	2015-11-23 11:47:54 -08:00
Jake McGinty	69ee4cbc71	select all threads fixes #4565 // FREEBIE	2015-11-23 11:43:54 -08:00
Moxie Marlinspike	2790128e9c	Disable mic/camera on inactive group thread Fixes #4653 Fixes #3334 // FREEBIE	2015-11-23 11:42:02 -08:00
Moxie Marlinspike	a4f7b78fd0	Make InputPanel fully responsible for emoji toggle Fixes #4638 // FREEBIE	2015-11-23 11:42:02 -08:00
Moxie Marlinspike	fc5777e904	Manually encode voice messages to AAC with ADTS headers Should resolve issues with platforms that don't support AMR (!). Fixes #4640 Fixes #4652 Fixes #4647 // FREEBIE	2015-11-23 11:42:02 -08:00
Jake McGinty	a0beb7f0e0	scroll all the way fixes #4664 closes #4695 // FREEBIE	2015-11-23 11:38:33 -08:00
Jake McGinty	d58f4d1232	don't allow fast scrolling until data is available fixes #4666 closes #4693 // FREEBIE	2015-11-23 11:36:13 -08:00
Jake McGinty	473e470883	fix header/footer item ID issue fixes #4667 Closes #4685 // FREEBIE	2015-11-22 17:30:36 -08:00
agrajaghh	4dce79334d	fix crash in RecipientPreferenceActivity fixes #4674 closes #4679 // FREEBIE	2015-11-22 22:14:02 +01:00
Moxie Marlinspike	e914496216	Remove identity menu option from conversation list // FREEBIE	2015-11-22 09:32:02 -08:00
Moxie Marlinspike	9b3457f0b2	Don't choke so hard on random QR codes Fixes #4642 // FREEBIE	2015-11-22 09:28:36 -08:00
Moxie Marlinspike	d21fe517e4	Bump version to 3.5.0 // FREEBIE	2015-11-20 11:26:36 -08:00
Moxie Marlinspike	8290970d50	Updated translations // FREEBIE	2015-11-20 10:53:38 -08:00
Jake McGinty	2e8841c1d6	make RecyclerView unique IDs per thread Closes #4619 // FREEBIE	2015-11-20 10:48:25 -08:00
Moxie Marlinspike	dc1b420fef	Voice Note -> Voice Message Fixes #4628 // FREEBIE	2015-11-20 10:25:08 -08:00
Moxie Marlinspike	e41f34729e	Fix for voice message race conditions Fixes #4625 // FREEBIE	2015-11-20 10:22:36 -08:00
Jake McGinty	4fe6256967	run Camera.startPreview() off main thread Closes #4620 // FREEBIE	2015-11-20 08:15:24 -08:00
Geonu Kang	d9467ef3c5	Extract "Devices" preference category title to string resource Fixes #4621 // FREEBIE	2015-11-20 13:50:31 +09:00
Geonu Kang	d5bf1b6137	Fix "Repeat new passphrase" spelling Fixes #4617 // FREEBIE	2015-11-20 11:06:41 +09:00
Moxie Marlinspike	bfe4ad6c34	Voice notes Closes #4610 Closes #3563 // FREEBIE	2015-11-19 17:37:48 -08:00
Jake McGinty	4e8e8978f4	update camera preview strategy // FREEBIE	2015-11-19 17:34:02 -08:00
Moxie Marlinspike	7817c7697e	Fix for audio attachment server NPE Fixes #4615 // FREEBIE	2015-11-19 15:59:24 -08:00
brumsel	06f2908d78	Don't show images without data under "all images" This affects images - that have yet to be downloaded (using media download controls) - that are currently being downloaded - that failed to download closes #4507	2015-11-19 13:21:23 -08:00
Jake McGinty	61386e9ca9	more useful contact select headers Closes #4608 // FREEBIE	2015-11-19 11:56:40 -08:00
Jake McGinty	4314a4b42b	add stable IDs to conversations fixes #2856 Closes #4607 // FREEBIE	2015-11-19 11:46:56 -08:00
Moxie Marlinspike	945636ac5c	Don't show reminder view on quick reply Fixes #4524 // FREEBIE	2015-11-19 11:43:17 -08:00
Moxie Marlinspike	ba4ebed59b	Fix checksum Fixes #4605 // FREEBIE	2015-11-19 11:35:38 -08:00
Moxie Marlinspike	7c0bf0c871	Device provisioning Closes #4553 // FREEBIE	2015-11-19 11:30:39 -08:00
Jake McGinty	02c37e815c	enable media forwarding fixes #1362 closes #4589 // FREEBIE	2015-11-19 11:27:13 -08:00
agrajaghh	6a99c6c4ac	Fix "Silent" summary for ringtone preference fixes #3962 Closes #4441 //FREEBIE	2015-11-19 11:13:24 -08:00
agrajaghh	a65ade5366	add action buttons to the call notification fixes #4160 Closes #4490	2015-11-19 11:12:15 -08:00
agrajaghh	332c722f1d	fix Code style Guidelines link in contributing.md fixes #4596 closes #4598 //FREEBIE	2015-11-19 11:08:41 -08:00
Jake McGinty	7aeb4c96ee	fix crash on null Android contact name fixes #4592 Closes #4594 // FREEBIE	2015-11-19 11:07:39 -08:00
Jake McGinty	cd085faecd	move instrumentation test to unit tests Closes #4593 // FREEBIE	2015-11-19 11:06:34 -08:00
Geonu Kang	1323b49c57	Use separate menu title strings for insecure/secure calls Fixes #4579 Closes #4580 // FREEBIE	2015-11-19 11:02:29 -08:00
Max Muth	9915fa347f	Update donation image in readme fixes #4542 //FREEBIE	2015-11-19 11:00:50 -08:00
Jake McGinty	bcd08956bd	clear drafts immediately upon sending or new intent fixes #3843 closes #3850 Closes #4571 // FREEBIE	2015-11-19 10:59:10 -08:00
Jake McGinty	25da3525fa	use material labels for passphrase text closes #3374 Closes #4570 // FREEBIE	2015-11-19 10:57:49 -08:00
McLoo	245c0adeea	add dark theme to PassphraseChangeActivity also adding DynamicLanguage to fix ActionBar language changes	2015-11-19 10:57:46 -08:00
Jake McGinty	0d06e78d25	fix quick attachment open animation Closes #4569 // FREEBIE	2015-11-19 10:57:02 -08:00
Jake McGinty	2ce2a0d5c3	add refresh in overflow to NewConversationActivity fixes #4470 closes #4564 // FREEBIE	2015-11-19 10:47:42 -08:00
Ben Bodenmiller	040f8c81bf	remove travis ci file since travis is not used Closes #4543 // FREEBIE	2015-11-19 10:43:43 -08:00
heyimgay	ce1c6e2372	signalize attachment filename Closes #4541	2015-11-19 10:42:49 -08:00
Christian Ascheberg	1d8aef1669	Plural group join message Closes #4535 Fixes #4521 // FREEBIE	2015-11-19 10:40:57 -08:00
Geonu Kang	cca38ddf3f	Improve Delete Thread, Reset Secure Session confirmation dialogs Fixes #4512 Closes #4513 // FREEBIE	2015-11-19 10:35:45 -08:00
agrajaghh	ce617fb7cb	hide irrelevant preferences in RecipientPreferenceActivity fixes #4505 Closes #4509 //FREEBIE	2015-11-19 10:31:11 -08:00
Jake McGinty	43ebf829ca	remove unmaintained espresso tests we hardly knew ye closes #4559 // FREEBIE	2015-11-19 10:30:26 -08:00
Jake McGinty	487f8cbb38	fix broken unit tests fixes #4534 // FREEBIE	2015-11-19 10:30:26 -08:00
Jake McGinty	36426a74c1	correct all colorControl* AppCompat attributes solves problem described in #4494 // FREEBIE	2015-11-19 10:30:26 -08:00
heyimgay	04f9187c14	activated state of switches match textsecure color fixes #3881	2015-11-19 10:30:26 -08:00
Sam Lanning	8efe6e7286	Make long pressing the attach button open the transport popup // FREEBIE	2015-11-19 10:30:26 -08:00
Moxie Marlinspike	745faa12a7	Fix for outgoing group update display Fixes #4444 // FREEBIE	2015-11-19 10:30:26 -08:00
Dustin Lim	0cd4cc67af	save fragment state when changing theme/langugage closes #2782 // FREEBIE	2015-11-19 10:30:26 -08:00
agrajaghh	9201d50f05	let the quick camera remember front/back mode fixes #4438 closes #4440 //FREEBIE	2015-11-19 10:30:26 -08:00
Jake McGinty	f82a7fee49	re-commit refactored CameraView closes #4529 Confirmed fixed front-camera bug in Galaxy Nexus. // FREEBIE	2015-11-19 10:30:26 -08:00
Sam Lanning	66578a2c76	Change notification privacy setting wording "Neither" -> "No name or message" fixes #3903 closes #3966 // FREEBIE	2015-11-19 10:30:26 -08:00
agrajaghh	c4339813e6	migrate to AppCompatDialog closes #3222	2015-11-19 10:30:26 -08:00
Carlin	927aac2c4a	Add button to toggle passphrase visibility closes #3776 // FREEBIE	2015-11-19 10:30:26 -08:00
Heartsucker	5a29c61dac	Correctly sets subtitle on conversation batch select mode during first selection fixes #3565 closes #3628	2015-11-19 10:30:26 -08:00
Calvin Hu	149ac9f417	when camera preview is open, the preview toggle button will close the preview closes #3574	2015-11-19 10:30:26 -08:00
McLoo	6c20a4c08b	Change 'Title' to 'Group name' in group update message closes #3424 //FREEBIE	2015-11-19 10:30:26 -08:00
Moxie Marlinspike	8fc690d8e0	Update to libtextsecure 1.8.3 Fixes #4549 // FREEBIE	2015-11-19 10:30:26 -08:00
Jake McGinty	dd0a952c83	avoid older android 9patch transparency bugs // FREEBIE	2015-11-19 10:30:26 -08:00
Moxie Marlinspike	ff123943cb	Fully differentiate Signal vs non-Signal contacts // FREEBIE	2015-11-19 10:30:25 -08:00
Moxie Marlinspike	493bd9be6b	Update link to transifex // FREEBIE	2015-11-18 08:36:17 -08:00
Moxie Marlinspike	028a1ab2b0	Bump version to 3.4.2 // FREEBIE	2015-11-16 11:57:02 -08:00
Moxie Marlinspike	058bcf1f4a	More shortcode fixes for Germany // FREEBIE	2015-11-16 11:35:11 -08:00
Jake McGinty	ae379cd3dd	fix external gif sharing fixes #4539 Closes #4556 // FREEBIE	2015-11-16 11:28:03 -08:00
Jake McGinty	f3a4634d30	fix keyboard/focus regressions I don't know how it was working the first time. fixes #4527 Closes #4555 // FREEBIE	2015-11-16 11:27:05 -08:00
Moxie Marlinspike	de3106344a	Bump version to 3.4.1 // FREEBIE	2015-11-14 15:43:39 -08:00
Moxie Marlinspike	fecc5e63e8	Update language translations // FREEBIE	2015-11-14 15:22:30 -08:00
Moxie Marlinspike	69f5aacd25	Consider everything <= len(4) a short code, except short countries // FREEBIE	2015-11-14 15:17:05 -08:00
Moxie Marlinspike	2a753c7795	Uhh, switch from valid to possible short codes? Fixes #4478 // FREEBIE	2015-11-13 17:07:43 -08:00
Moxie Marlinspike	c17e24250d	Bump version to 3.4.0 // FREEBIE	2015-11-13 11:56:21 -08:00
Moxie Marlinspike	cb60e08da2	Update language translations // FREEBIE	2015-11-13 11:42:19 -08:00
Moxie Marlinspike	21f04605c6	Don't E164 shortcodes Fixes #4478 // FREEBIE	2015-11-13 11:23:37 -08:00
Jake McGinty	0c75e652eb	bring back the ripple when clicking on preview Closes #4506 // FREEBIE	2015-11-12 15:20:17 -08:00
Jake McGinty	d3000f384f	adhere to android plural standards // FREEBIE Closes #4503	2015-11-12 15:20:17 -08:00
Jake McGinty	76b0183e0f	move db query off main thread, fix group self-add fixes #4168 Closes #4502 // FREEBIE	2015-11-12 15:20:17 -08:00
Jake McGinty	e51e5cdfd4	fail faster in FileNotFoundException case Fixes #3053 Closes #4499 // FREEBIE	2015-11-12 15:20:17 -08:00
Jake McGinty	5b1e5b18f9	reset contact selection after batch invite fixes #4452 Closes #4498 // FREEBIE	2015-11-12 15:20:16 -08:00
Moxie Marlinspike	fb9ba8cb8d	Tint audio controls to be visible in dark theme Fixes #4353 Closes #4466 // FREEBIE	2015-11-12 15:20:16 -08:00
Moxie Marlinspike	b136fed6f7	Update contact DB on incoming messages When we receive a Signal message from a previously unregistered user, reflect that in the contact DB. Fixes #3949 Closes #4492 // FREEBIE	2015-11-12 15:20:16 -08:00
Jake McGinty	fb8d6cb538	contact selection reeemix 1) RecyclerView-based, with better long scroller and more material-inspired look. 2) Add badge for Signal users to contact selection list. // FREEBIE	2015-11-12 15:20:16 -08:00
Moxie Marlinspike	7bec5efe1a	Add 'Signal Call' option to contact card Fixes #4392 Closes #4465 // FREEBIE	2015-11-12 15:20:16 -08:00
agrajaghh	5c59c3f423	make invite strings plural fixes #4388 Closes #4389 // FREEBIE	2015-11-12 15:20:16 -08:00
Sebastian Morr	181c7dfd85	Add the option to mute notifications for one year. Fixes #4448. Closes #4454	2015-11-12 15:20:16 -08:00
Jake McGinty	d05097a6fd	Refactor group logic (no visual changes) Closes #4480 // FREEBIE	2015-11-12 15:20:16 -08:00
Moxie Marlinspike	75483299dc	Upgrade libtextsecure 1.8.2 // FREEBIE	2015-11-12 15:20:16 -08:00
brumsel	5333647794	Always play "sonar" on call initialization If "sonar" was the last sound played on the last call, it wasn't being played on the next calling attempt. Closes #4473	2015-11-12 15:20:16 -08:00
RiseT	e1f9519235	Replace 'my' with 'your' See https://www.google.com/design/spec/style/writing.html#writing-language // FREEBIE	2015-11-12 15:20:16 -08:00
RiseT	7f0b0803bc	Change 'SD card' to 'storage' & cosmetic corrections Fixes #3920	2015-11-12 15:20:16 -08:00