Update the nav icon style in referencedesign
Bug: 162114801
Test: manual
Change-Id: I5f06f0c9022d8e9ff3574e311d671bf16dd63a54
diff --git a/car-ui-lib/referencedesign/res/drawable/car_ui_icon_arrow_back.xml b/car-ui-lib/referencedesign/res/drawable/car_ui_icon_arrow_back.xml
new file mode 100644
index 0000000..4ad49b2
--- /dev/null
+++ b/car-ui-lib/referencedesign/res/drawable/car_ui_icon_arrow_back.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:autoMirrored="true"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/car-ui-lib/referencedesign/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml b/car-ui-lib/referencedesign/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml
index 03f8d82..1f89ff2 100644
--- a/car-ui-lib/referencedesign/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml
+++ b/car-ui-lib/referencedesign/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml
@@ -16,6 +16,23 @@
~ limitations under the License.
~
-->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="#27ffffff"
- android:radius="48dp"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true">
+ <shape android:shape="oval">
+ <solid android:color="#3D94CBFF"/>
+ <stroke android:width="8dp"
+ android:color="#94CBFF"/>
+ <size android:width="48dp"
+ android:height="48dp"/>
+ </shape>
+ </item>
+ <item>
+ <ripple android:color="#27ffffff">
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <solid android:color="#FFFFFF"/>
+ </shape>
+ </item>
+ </ripple>
+ </item>
+</selector>
diff --git a/car-ui-lib/referencedesign/res/layout-ldrtl-port/car_ui_base_layout_toolbar.xml b/car-ui-lib/referencedesign/res/layout-ldrtl-port/car_ui_base_layout_toolbar.xml
index 678376a..d988179 100644
--- a/car-ui-lib/referencedesign/res/layout-ldrtl-port/car_ui_base_layout_toolbar.xml
+++ b/car-ui-lib/referencedesign/res/layout-ldrtl-port/car_ui_base_layout_toolbar.xml
@@ -64,7 +64,8 @@
<FrameLayout
android:id="@+id/car_ui_toolbar_nav_icon_container"
- android:layout_width="112dp"
+ style="@style/Widget.CarUi.Toolbar.NavIconContainer"
+ android:layout_width="@dimen/car_ui_toolbar_margin"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/car_ui_toolbar_row_separator_guideline"
app:layout_constraintLeft_toLeftOf="parent"
@@ -72,11 +73,11 @@
<ImageView
android:id="@+id/car_ui_toolbar_nav_icon"
+ style="@style/Widget.CarUi.Toolbar.NavIcon"
android:layout_width="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_height="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_gravity="center"
android:scaleType="fitXY"
- android:background="@drawable/car_ui_toolbar_menu_item_icon_ripple"
android:tint="@color/car_ui_text_color_primary"/>
<ImageView
diff --git a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_base_layout_toolbar.xml b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_base_layout_toolbar.xml
index 605709f..52c9f3f 100644
--- a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_base_layout_toolbar.xml
+++ b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_base_layout_toolbar.xml
@@ -56,7 +56,8 @@
<FrameLayout
android:id="@+id/car_ui_toolbar_nav_icon_container"
- android:layout_width="112dp"
+ style="@style/Widget.CarUi.Toolbar.NavIconContainer"
+ android:layout_width="@dimen/car_ui_toolbar_margin"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -64,7 +65,7 @@
<ImageView
android:id="@+id/car_ui_toolbar_nav_icon"
- android:background="@drawable/car_ui_toolbar_menu_item_icon_ripple"
+ style="@style/Widget.CarUi.Toolbar.NavIcon"
android:tint="@color/car_ui_text_color_primary"
android:layout_width="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_height="@dimen/car_ui_toolbar_nav_icon_size"
diff --git a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar.xml b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar.xml
index a2d884d..2714f44 100644
--- a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar.xml
+++ b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar.xml
@@ -23,7 +23,8 @@
<FrameLayout
android:id="@+id/car_ui_toolbar_nav_icon_container"
- android:layout_width="112dp"
+ style="@style/Widget.CarUi.Toolbar.NavIconContainer"
+ android:layout_width="@dimen/car_ui_toolbar_margin"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -31,7 +32,7 @@
<ImageView
android:id="@+id/car_ui_toolbar_nav_icon"
- android:background="@drawable/car_ui_toolbar_menu_item_icon_ripple"
+ style="@style/Widget.CarUi.Toolbar.NavIcon"
android:tint="@color/car_ui_text_color_primary"
android:layout_width="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_height="@dimen/car_ui_toolbar_nav_icon_size"
diff --git a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar_two_row.xml b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar_two_row.xml
index 395e48a..6935121 100644
--- a/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar_two_row.xml
+++ b/car-ui-lib/referencedesign/res/layout-ldrtl/car_ui_toolbar_two_row.xml
@@ -30,7 +30,8 @@
<FrameLayout
android:id="@+id/car_ui_toolbar_nav_icon_container"
- android:layout_width="112dp"
+ style="@style/Widget.CarUi.Toolbar.NavIconContainer"
+ android:layout_width="@dimen/car_ui_toolbar_margin"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/car_ui_toolbar_row_separator_guideline"
app:layout_constraintLeft_toLeftOf="parent"
@@ -38,11 +39,11 @@
<ImageView
android:id="@+id/car_ui_toolbar_nav_icon"
+ style="@style/Widget.CarUi.Toolbar.NavIcon"
android:layout_width="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_height="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_gravity="center"
android:scaleType="fitXY"
- android:background="@drawable/car_ui_toolbar_menu_item_icon_ripple"
android:tint="@color/car_ui_text_color_primary"/>
<ImageView
diff --git a/car-ui-lib/referencedesign/res/layout-port/car_ui_base_layout_toolbar.xml b/car-ui-lib/referencedesign/res/layout-port/car_ui_base_layout_toolbar.xml
index b0fd6c4..283baf8 100644
--- a/car-ui-lib/referencedesign/res/layout-port/car_ui_base_layout_toolbar.xml
+++ b/car-ui-lib/referencedesign/res/layout-port/car_ui_base_layout_toolbar.xml
@@ -64,7 +64,8 @@
<FrameLayout
android:id="@+id/car_ui_toolbar_nav_icon_container"
- android:layout_width="112dp"
+ style="@style/Widget.CarUi.Toolbar.NavIconContainer"
+ android:layout_width="@dimen/car_ui_toolbar_margin"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/car_ui_toolbar_row_separator_guideline"
app:layout_constraintStart_toStartOf="parent"
@@ -72,11 +73,11 @@
<ImageView
android:id="@+id/car_ui_toolbar_nav_icon"
+ style="@style/Widget.CarUi.Toolbar.NavIcon"
android:layout_width="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_height="@dimen/car_ui_toolbar_nav_icon_size"
android:layout_gravity="center"
android:scaleType="fitXY"
- android:background="@drawable/car_ui_toolbar_menu_item_icon_ripple"
android:tint="@color/car_ui_text_color_primary"/>
<ImageView
diff --git a/car-ui-lib/referencedesign/res/values/dimens.xml b/car-ui-lib/referencedesign/res/values/dimens.xml
new file mode 100644
index 0000000..80fc15b
--- /dev/null
+++ b/car-ui-lib/referencedesign/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+<resources>
+ <dimen name="car_ui_toolbar_margin">76dp</dimen>
+</resources>
diff --git a/car-ui-lib/referencedesign/res/values/styles.xml b/car-ui-lib/referencedesign/res/values/styles.xml
new file mode 100644
index 0000000..491f1a9
--- /dev/null
+++ b/car-ui-lib/referencedesign/res/values/styles.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="Widget.CarUi" parent="android:Widget.DeviceDefault"/>
+
+ <style name="Widget.CarUi.Toolbar"/>
+
+ <style name="Widget.CarUi.Toolbar.NavIconContainer">
+ <item name="android:layout_marginVertical">10dp</item>
+ <item name="android:layout_marginHorizontal">18dp</item>
+ <item name="android:background">@drawable/car_ui_toolbar_menu_item_icon_ripple</item>
+ </style>
+
+ <style name="Widget.CarUi.Toolbar.NavIcon">
+ <item name="android:tint">@color/car_ui_text_color_primary</item>
+ <item name="android:src">@drawable/car_ui_icon_arrow_back</item>
+ </style>
+</resources>
diff --git a/car-ui-lib/referencedesign/res/xml/overlays.xml b/car-ui-lib/referencedesign/res/xml/overlays.xml
index ce92bfc..d7aecb2 100644
--- a/car-ui-lib/referencedesign/res/xml/overlays.xml
+++ b/car-ui-lib/referencedesign/res/xml/overlays.xml
@@ -3,6 +3,16 @@
<item target="layout/car_ui_toolbar" value="@layout/car_ui_toolbar"/>
<item target="layout/car_ui_toolbar_two_row" value="@layout/car_ui_toolbar_two_row"/>
+ <item target="drawable/car_ui_icon_arrow_back" value="@drawable/car_ui_icon_arrow_back"/>
+ <item target="drawable/car_ui_toolbar_menu_item_icon_ripple" value="@drawable/car_ui_toolbar_menu_item_icon_ripple"/>
+
+ <item target="style/Widget.CarUi" value="@style/Widget.CarUi"/>
+ <item target="style/Widget.CarUi.Toolbar" value="@style/Widget.CarUi.Toolbar"/>
+ <item target="style/Widget.CarUi.Toolbar.NavIconContainer" value="@style/Widget.CarUi.Toolbar.NavIconContainer"/>
+ <item target="style/Widget.CarUi.Toolbar.NavIcon" value="@style/Widget.CarUi.Toolbar.NavIcon"/>
+
+ <item target="dimen/car_ui_toolbar_margin" value="@dimen/car_ui_toolbar_margin"/>
+
<item target="bool/car_ui_toolbar_nav_icon_reserve_space" value="@bool/car_ui_toolbar_nav_icon_reserve_space" />
<item target="bool/car_ui_toolbar_logo_fills_nav_icon_space" value="@bool/car_ui_toolbar_logo_fills_nav_icon_space" />
