merge in master-release history after reset to e026fac8868f7393ccab2ce4ceb8faa9bd2530b2
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index a20935f..d18754a 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -14,6 +14,13 @@
android:background="@drawable/search_bg"
android:gravity="center_vertical"
>
+ <ImageView
+ android:id="@+id/search_magnifying_glass"
+ android:layout_height="@dimen/search_box_icon_size"
+ android:layout_width="@dimen/search_box_icon_size"
+ android:layout_margin="@dimen/search_box_icon_margin"
+ android:padding="@dimen/search_box_search_icon_padding"
+ android:src="@drawable/ic_ab_search" />
<EditText
android:id="@+id/search_view"
android:layout_width="0dp"
@@ -30,7 +37,7 @@
android:id="@+id/search_close_button"
android:layout_height="@dimen/search_box_icon_size"
android:layout_width="@dimen/search_box_icon_size"
- android:padding="6dp"
+ android:layout_margin="@dimen/search_box_icon_margin"
android:src="@drawable/ic_close_dk"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
@@ -40,7 +47,7 @@
android:id="@+id/voice_search_button"
android:layout_height="@dimen/search_box_icon_size"
android:layout_width="@dimen/search_box_icon_size"
- android:padding="@dimen/search_box_icon_padding"
+ android:layout_margin="@dimen/search_box_icon_margin"
android:src="@drawable/ic_voice_search"
android:clickable="true"
android:contentDescription="@string/description_start_voice_search"
@@ -49,7 +56,7 @@
android:id="@+id/dialtacts_options_menu_button"
android:layout_width="@dimen/search_box_icon_size"
android:layout_height="@dimen/search_box_icon_size"
- android:padding="@dimen/search_box_icon_padding"
+ android:layout_margin="@dimen/search_box_icon_margin"
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_overflow_menu"
android:tint="@color/searchbox_options_menu_color" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 93b98ef..8ceda62 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -101,15 +101,16 @@
<!-- Search box text size -->
<dimen name="search_text_size">13.24sp</dimen>
<!-- Search box interior padding - left -->
- <dimen name="search_box_left_padding">16dp</dimen>
+ <dimen name="search_box_left_padding">8dp</dimen>
<!-- Search box interior padding - right -->
<dimen name="search_box_right_padding">8dp</dimen>
<!-- Padding around the icon in the search box. -->
- <dimen name="search_box_icon_padding">3dp</dimen>
+ <dimen name="search_box_icon_margin">4dp</dimen>
+ <dimen name="search_box_search_icon_padding">4dp</dimen>
<!-- Left margin of the text field in the search box. -->
<dimen name="search_box_text_left_margin">8dp</dimen>
<!-- Size of the icon (voice search, close search) in the search box. -->
- <dimen name="search_box_icon_size">37dp</dimen>
+ <dimen name="search_box_icon_size">28dp</dimen>
<!-- Size of text in tabs. -->
<dimen name="tab_height">43dp</dimen>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 6fdf549..2b66355 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -190,6 +190,7 @@
private String mPendingSearchViewQuery;
private EditText mSearchView;
+ private View mSearchIcon;
private View mSearchViewCloseButton;
private View mVoiceSearchButton;
@@ -334,6 +335,8 @@
SearchEditTextLayout actionBarView = (SearchEditTextLayout) actionBar.getCustomView();
actionBarView.setPreImeKeyListener(mSearchEditTextLayoutListener);
+ mSearchIcon = actionBarView.findViewById(R.id.search_magnifying_glass);
+
mSearchView = (EditText) actionBarView.findViewById(R.id.search_view);
mSearchView.addTextChangedListener(mPhoneSearchQueryTextListener);
mSearchView.setOnTouchListener(mSearchViewOnTouchListener);
@@ -604,6 +607,9 @@
}
mListsFragment.maybeShowActionBar();
+ if (isInSearchUi()) {
+ mSearchIcon.setVisibility(View.GONE);
+ }
}
/**
@@ -810,6 +816,10 @@
transaction.commit();
mListsFragment.getView().animate().alpha(0).withLayer();
+
+ if (!mIsDialpadShown) {
+ mSearchIcon.setVisibility(View.GONE);
+ }
}
/**
@@ -837,6 +847,7 @@
transaction.commit();
mListsFragment.getView().animate().alpha(1).withLayer();
+ mSearchIcon.setVisibility(View.VISIBLE);
}
/** Returns an Intent to launch Call Settings screen */