diff options
author | Timi Rautamäki <timi.rautamaki@gmail.com> | 2021-07-11 20:40:27 +0200 |
---|---|---|
committer | Timi Rautamäki <timi.rautamaki@gmail.com> | 2021-07-12 07:44:18 +0200 |
commit | 2f5b5ea433a1dd4328dfdf24d1f437a8e5a31a6e (patch) | |
tree | ce460eabf802f3bc39cfc599b5703595debead31 /java/com/android/dialer/main | |
parent | 9f5f0ee9b232f53a12d28a269b25b54af2406702 (diff) |
Dialer: improve search bar
* Make background color lighter
* Update border radius
* Update ripple to follow border radius
* Remove the background color, use same as activity
* Update the back-icon color to white/black for consistency
Change-Id: I648a2bd0da47fec99d8a8457c70451e77ed9f8be
Diffstat (limited to 'java/com/android/dialer/main')
4 files changed, 35 insertions, 9 deletions
diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml index 88f5a04ca..2130db443 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml @@ -14,8 +14,15 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="?android:attr/colorBackgroundFloating"/> - <corners android:radius="2dp"/> -</shape> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/dialer_ripple_color"> + + <item android:id="@android:id/mask"> + <shape android:shape="rectangle"> + <solid android:color="@android:color/white" /> + <corners android:radius="8dp" /> + </shape> + </item> + + <item android:drawable="@drawable/search_bar_background_rounded_corners_shape" /> +</ripple> diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml new file mode 100644 index 000000000..ee3219ec1 --- /dev/null +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="?attr/colorBackgroundSearchBar"/> + <corners android:radius="8dp"/> +</shape> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml index a7b3aebd2..d9051a691 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml @@ -29,7 +29,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" - android:tint="?android:attr/colorPrimary"/> + android:tint="?colorIcon"/> <EditText android:id="@+id/search_view" @@ -62,4 +62,4 @@ android:src="@drawable/quantum_ic_close_vd_theme_24" android:tint="?colorIcon" android:visibility="gone"/> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml index 049cf2ef5..129aac9dd 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -18,7 +18,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/expanded_search_bar_height" - android:background="?android:attr/colorPrimary" app:contentInsetEnd="0dp" app:contentInsetStart="0dp"> <FrameLayout @@ -38,7 +37,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical"> <ImageView |