Revert "UnifiedEmail: Database Expression tree is too large cause FC."

This reverts commit 7fd67cc7d9cd697b2341a192bcee0f0a08af42c7.

3 files changed, 0 insertions, 15 deletions

diff --git a/res/layout/mail_actionbar_searchview.xml b/res/layout/mail_actionbar_searchview.xml
index be100e176..b65620c3d 100644
--- a/res/layout/mail_actionbar_searchview.xml
+++ b/res/layout/mail_actionbar_searchview.xml
@@ -50,7 +50,6 @@
         android:singleLine="true"
         android:textAlignment="viewStart"
         android:textColor="@color/search_query_text"
-        android:maxLength="40"
         android:textColorHint="@color/search_query_hint_text"
         android:textSize="16sp" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7d043ba49..6c10858f6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -602,7 +602,6 @@
     <string name="search_title" translatable="false">Unified Email</string>
     <!-- Shown in light gray in the Search box when no text has been entered [CHAR LIMIT=20]-->
     <string name="search_hint">Search</string>
-    <string name="search_input_limit_number">Search word Input number limit of 40</string>
     <!-- Search Results: Text for status of the search when the results are completely loaded [CHAR LIMIT=10] -->
     <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
     <!-- Voice search is not supported on this device [CHAR LIMIT=100] -->
diff --git a/src/com/android/mail/ui/MaterialSearchActionView.java b/src/com/android/mail/ui/MaterialSearchActionView.java
index 292ad589b..ba4375aea 100644
--- a/src/com/android/mail/ui/MaterialSearchActionView.java
+++ b/src/com/android/mail/ui/MaterialSearchActionView.java
@@ -37,7 +37,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.mail.R;
 import com.android.mail.utils.ViewUtils;
@@ -69,8 +68,6 @@ public class MaterialSearchActionView extends LinearLayout implements TextWatche
     private ImageView mBackButton;
     private EditText mQueryText;
     private ImageView mEndingButton;
-    private Context mContext;
-    public final static int SEARCH_INPUT_LIMIT_NUMBER = 40;
 
     public MaterialSearchActionView(Context context) {
         this(context, null);
@@ -90,8 +87,6 @@ public class MaterialSearchActionView extends LinearLayout implements TextWatche
         mDarkBgVoiceDrawable = R.drawable.ic_mic_wht_24dp;
         mLightBgTextColor = res.getColor(R.color.search_query_text);
         mDarkBgTextColor = res.getColor(android.R.color.white);
-
-        mContext = context;
     }
 
     // PUBLIC API
@@ -208,14 +203,6 @@ public class MaterialSearchActionView extends LinearLayout implements TextWatche
     public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
         mController.onQueryTextChanged(charSequence.toString());
         setupEndingButton(charSequence);
-        limitInputLength(charSequence);
-    }
-
-    private void limitInputLength(CharSequence charSequence) {
-        if(charSequence.length()>=SEARCH_INPUT_LIMIT_NUMBER){
-            Toast.makeText(mContext,R.string.search_input_limit_number,Toast.LENGTH_LONG).show();
-        }
-
     }
 
     @Override