diff options
| -rw-r--r-- | res/layout/mail_actionbar_searchview.xml | 4 | ||||
| -rw-r--r-- | res/layout/one_pane_activity.xml | 2 | ||||
| -rw-r--r-- | res/layout/search_suggestion_item.xml | 2 | ||||
| -rw-r--r-- | res/layout/two_pane_activity.xml | 4 | ||||
| -rw-r--r-- | res/values/dimen.xml | 3 | ||||
| -rw-r--r-- | src/com/android/mail/ui/MaterialSearchActionView.java | 24 |
6 files changed, 28 insertions, 11 deletions
diff --git a/res/layout/mail_actionbar_searchview.xml b/res/layout/mail_actionbar_searchview.xml index 62164a821..7a253b674 100644 --- a/res/layout/mail_actionbar_searchview.xml +++ b/res/layout/mail_actionbar_searchview.xml @@ -30,8 +30,6 @@ android:layout_height="match_parent" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/search_back_desc" - android:paddingLeft="@dimen/search_button_padding" - android:paddingRight="@dimen/search_button_padding" android:scaleType="center" android:src="@drawable/ic_arrow_back_24dp_with_rtl" /> @@ -59,8 +57,6 @@ android:layout_width="@dimen/search_ending_button_width" android:layout_height="match_parent" android:background="?android:attr/selectableItemBackground" - android:paddingLeft="@dimen/search_button_padding" - android:paddingRight="@dimen/search_button_padding" android:scaleType="center" /> </com.android.mail.ui.MaterialSearchActionView>
\ No newline at end of file diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml index c76beedc6..ef0464b8e 100644 --- a/res/layout/one_pane_activity.xml +++ b/res/layout/one_pane_activity.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:foregroundGravity="fill_horizontal|top" - android:foreground="?android:attr/windowContentOverlay" > + android:foreground="?android:attr/windowContentOverlay"> <FrameLayout android:id="@+id/content_pane" diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml index c53f42640..6f03117d3 100644 --- a/res/layout/search_suggestion_item.xml +++ b/res/layout/search_suggestion_item.xml @@ -26,8 +26,6 @@ android:id="@+id/search_overlay_item_icon" android:layout_width="@dimen/search_leading_button_width" android:layout_height="wrap_content" - android:paddingLeft="@dimen/search_button_padding" - android:paddingRight="@dimen/search_button_padding" android:scaleType="center" /> <TextView diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml index ca1159956..3b9ef3389 100644 --- a/res/layout/two_pane_activity.xml +++ b/res/layout/two_pane_activity.xml @@ -26,14 +26,14 @@ <!-- Main content --> <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:foreground="?android:attr/windowContentOverlay"> <com.android.mail.ui.TwoPaneLayout android:id="@+id/two_pane_activity" android:layout_width="match_parent" android:layout_height="match_parent" android:foregroundGravity="fill_horizontal|top" - android:foreground="?android:attr/windowContentOverlay" android:background="@color/tablet_background_gray"> <FrameLayout diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 54be9dc01..f071ea4c9 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -147,8 +147,7 @@ <dimen name="widget_senders_padding_end">16dip</dimen> <dimen name="widget_attachment_padding_end">8dp</dimen> - <dimen name="search_leading_button_width">72dp</dimen> - <dimen name="search_button_padding">16dp</dimen> + <dimen name="search_leading_button_width">56dp</dimen> <dimen name="search_main_text_padding">16dp</dimen> <dimen name="search_ending_button_width">56dp</dimen> <dimen name="search_suggestion_padding">16dp</dimen> diff --git a/src/com/android/mail/ui/MaterialSearchActionView.java b/src/com/android/mail/ui/MaterialSearchActionView.java index e9f668355..1b131e05d 100644 --- a/src/com/android/mail/ui/MaterialSearchActionView.java +++ b/src/com/android/mail/ui/MaterialSearchActionView.java @@ -22,7 +22,10 @@ import android.content.res.Resources; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; +import android.view.ActionMode; import android.view.KeyEvent; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; @@ -88,6 +91,27 @@ public class MaterialSearchActionView extends LinearLayout implements TextWatche mQueryText.setOnClickListener(this); mQueryText.setOnEditorActionListener(this); mQueryText.setOnKeyListener(this); + // Disable CAB for search edittext + mQueryText.setCustomSelectionActionModeCallback(new ActionMode.Callback() { + @Override + public boolean onCreateActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + return false; + } + + @Override + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + return false; + } + + @Override + public void onDestroyActionMode(ActionMode mode) { + } + }); mEndingButton = (ImageView) findViewById(R.id.search_actionbar_ending_button); mEndingButton.setOnClickListener(this); setupEndingButton(mQueryText.getText()); |