From 0a9f28c228bf33b8c81cade838d83fa167c5119e Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 27 Nov 2015 15:46:40 -0800
Subject: [PATCH] Fix rogue action button toggleing in contact selection

Fixes #4700
// FREEBIE
---
 res/values/dimens.xml                                |  1 +
 .../securesms/components/ContactFilterToolbar.java   | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c1937aea22..100d0c4a75 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -38,6 +38,7 @@
     <dimen name="transfer_controls_expanded_width">150dp</dimen>
     <dimen name="transfer_controls_contracted_width">70dp</dimen>
     <dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
+    <dimen name="contact_selection_actions_tap_area">10dp</dimen>
 
     <!-- RedPhone -->
     <dimen name="incoming_widget_outer_radius">135dip</dimen>
diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
index e6f0e867d0..f26e21ba5e 100644
--- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
@@ -97,8 +96,9 @@ public class ContactFilterToolbar extends Toolbar {
         notifyListener();
       }
     });
-    expandTapArea(this, action, 500);
-    expandTapArea(toggleContainer, dialpadToggle, 500);
+
+    expandTapArea(this, action);
+    expandTapArea(toggleContainer, dialpadToggle);
   }
 
   @Override
@@ -131,10 +131,12 @@ public class ContactFilterToolbar extends Toolbar {
 
   private void displayTogglingView(View view) {
     toggle.display(view);
-    expandTapArea(toggleContainer, view, 500);
+    expandTapArea(toggleContainer, view);
   }
 
-  private void expandTapArea(final View container, final View child, final int padding) {
+  private void expandTapArea(final View container, final View child) {
+    final int padding = getResources().getDimensionPixelSize(R.dimen.contact_selection_actions_tap_area);
+
     container.post(new Runnable() {
       @Override
       public void run() {