diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-05-22 01:11:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 01:11:09 +0000 |
| commit | 3b8e22ea2f6fa7d407942833099de8a83c0f4774 (patch) | |
| tree | 29a2898f436c3b053c545c737438b13e2e56273b | |
| parent | 54d9c5019a34bd08d2ae01825759ef042fc96218 (diff) | |
| parent | bcef940ebcd0b85d2acef46b28e6622ed596f569 (diff) | |
Merge "Add shadow to expanded search box"
| -rw-r--r-- | res/drawable-hdpi/search_shadow.9.png | bin | 0 -> 183 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/search_shadow.9.png | bin | 0 -> 159 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/search_shadow.9.png | bin | 0 -> 198 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/search_shadow.9.png | bin | 0 -> 1148 bytes | |||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 1 | ||||
| -rw-r--r-- | src/com/android/dialer/widget/SearchEditTextLayout.java | 2 |
6 files changed, 2 insertions, 1 deletions
diff --git a/res/drawable-hdpi/search_shadow.9.png b/res/drawable-hdpi/search_shadow.9.png Binary files differnew file mode 100644 index 000000000..3dc1c17f6 --- /dev/null +++ b/res/drawable-hdpi/search_shadow.9.png diff --git a/res/drawable-mdpi/search_shadow.9.png b/res/drawable-mdpi/search_shadow.9.png Binary files differnew file mode 100644 index 000000000..0c33905cd --- /dev/null +++ b/res/drawable-mdpi/search_shadow.9.png diff --git a/res/drawable-xhdpi/search_shadow.9.png b/res/drawable-xhdpi/search_shadow.9.png Binary files differnew file mode 100644 index 000000000..5667ab368 --- /dev/null +++ b/res/drawable-xhdpi/search_shadow.9.png diff --git a/res/drawable-xxhdpi/search_shadow.9.png b/res/drawable-xxhdpi/search_shadow.9.png Binary files differnew file mode 100644 index 000000000..ff55620d0 --- /dev/null +++ b/res/drawable-xxhdpi/search_shadow.9.png diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index c164294c7..8445ff76d 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -323,6 +323,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O final ActionBar actionBar = getActionBar(); actionBar.setCustomView(R.layout.search_edittext); actionBar.setDisplayShowCustomEnabled(true); + actionBar.setBackgroundDrawable(null); mSearchEditTextLayout = (SearchEditTextLayout) actionBar.getCustomView(); mSearchEditTextLayout.setPreImeKeyListener(mSearchEditTextLayoutListener); diff --git a/src/com/android/dialer/widget/SearchEditTextLayout.java b/src/com/android/dialer/widget/SearchEditTextLayout.java index 33bf09f59..683084211 100644 --- a/src/com/android/dialer/widget/SearchEditTextLayout.java +++ b/src/com/android/dialer/widget/SearchEditTextLayout.java @@ -122,7 +122,7 @@ public class SearchEditTextLayout extends FrameLayout { if (expand) { AnimationUtils.crossFadeViews(mExpanded, mCollapsed, ANIMATION_DURATION); animator = ValueAnimator.ofFloat(1f, 0f); - setBackgroundColor(mBackgroundColor); + setBackgroundResource(R.drawable.search_shadow); mSearchView.requestFocus(); } else { AnimationUtils.crossFadeViews(mCollapsed, mExpanded, ANIMATION_DURATION); |
