summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorTimi Rautamäki <timi.rautamaki@gmail.com>2021-07-11 20:40:27 +0200
committerTimi Rautamäki <timi.rautamaki@gmail.com>2021-07-12 07:44:18 +0200
commit2f5b5ea433a1dd4328dfdf24d1f437a8e5a31a6e (patch)
treece460eabf802f3bc39cfc599b5703595debead31 /java
parent9f5f0ee9b232f53a12d28a269b25b54af2406702 (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')
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml17
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners_shape.xml21
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml4
-rw-r--r--java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml2
-rw-r--r--java/com/android/dialer/theme/base/res/values/attr.xml2
-rw-r--r--java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml1
-rw-r--r--java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml1
-rw-r--r--java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml1
8 files changed, 40 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
diff --git a/java/com/android/dialer/theme/base/res/values/attr.xml b/java/com/android/dialer/theme/base/res/values/attr.xml
index 606d161ad..790ae7043 100644
--- a/java/com/android/dialer/theme/base/res/values/attr.xml
+++ b/java/com/android/dialer/theme/base/res/values/attr.xml
@@ -15,6 +15,8 @@
~ limitations under the License
-->
<resources>
+ <!-- Used to color the search bar background -->
+ <attr name="colorBackgroundSearchBar" format="color"/>
<!-- Used to style all icons in Dialer. -->
<attr name="colorIcon" format="color"/>
<!-- Used to style some icons a little lighter in Dialer. -->
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
index 1d9ef699e..f0e7e6fad 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
@@ -46,6 +46,7 @@
<!-- These values should be used to color all backgrounds. -->
<item name="android:colorBackground">@color/dialer_background_color</item>
<item name="android:colorBackgroundFloating">@android:color/white</item>
+ <item name="colorBackgroundSearchBar">@color/dialer_search_bar_color</item>
<!-- These values should be used to set text color. -->
<item name="android:textColorPrimary">@color/dialer_primary_text_color</item>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
index 74cbb89c5..8d04c7253 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
@@ -19,5 +19,6 @@
<color name="dialer_theme_color_20pct">#335195EA</color>
<color name="dialer_secondary_color">#5195EA</color>
<color name="dialer_ripple_color">#33ffffff</color>
+ <color name="dialer_search_bar_color">@color/google_grey_900</color>
<color name="settings_primary_dark">#2374CE</color>
</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
index 4aa0b121c..e4d1e29aa 100644
--- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
@@ -21,5 +21,6 @@
<color name="dialer_secondary_color">#F50057</color>
<color name="dialer_background_color">#FAFAFA</color>
<color name="dialer_ripple_color">#1f000000</color>
+ <color name="dialer_search_bar_color">@color/google_grey_50</color>
<color name="settings_primary_dark">#1C3AA9</color>
</resources>