Make toggle button use rectangular focus highlight
car_ui_toolbar_menu_item_icon_container has a circular focus
highlight while car_ui_toolbar_menu_item_text_container has a
rectangular focus highlight. To make the toggle button show a
rectangular focus higlight, this CL moves the toggle button from
the former container to the latter container.
Fixes: 169883753
Test: manual
Change-Id: Id7eb768133ada8e568f4cb6e7b6fa44d876d85b0
diff --git a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/toolbar/MenuItemRenderer.java b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/toolbar/MenuItemRenderer.java
index 85141f1..102e732 100644
--- a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/toolbar/MenuItemRenderer.java
+++ b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/toolbar/MenuItemRenderer.java
@@ -149,6 +149,8 @@
mSwitch.setChecked(mMenuItem.isChecked());
mSwitch.setVisibility(View.VISIBLE);
if (mIsRotaryEnabledLayout) {
+ textContainerVisibility = View.VISIBLE;
+ } else {
iconContainerVisibility = View.VISIBLE;
}
} else if (hasText && hasIcon && textAndIcon) {
diff --git a/car-ui-lib/referencedesign/res/layout/car_ui_toolbar_menu_item.xml b/car-ui-lib/referencedesign/res/layout/car_ui_toolbar_menu_item.xml
index 18f2e16..be95cc1 100644
--- a/car-ui-lib/referencedesign/res/layout/car_ui_toolbar_menu_item.xml
+++ b/car-ui-lib/referencedesign/res/layout/car_ui_toolbar_menu_item.xml
@@ -38,14 +38,6 @@
android:layout_gravity="center"
android:tint="@color/car_ui_toolbar_menu_item_icon_color"
android:tintMode="src_in"/>
- <com.android.car.ui.uxr.DrawableStateSwitch
- android:id="@+id/car_ui_toolbar_menu_item_switch"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:background="@null"
- android:focusable="false"
- android:clickable="false"/>
</FrameLayout>
<FrameLayout
@@ -55,6 +47,14 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground">
<!-- These buttons must have clickable="false" or they will steal the click events from the container -->
+ <com.android.car.ui.uxr.DrawableStateSwitch
+ android:id="@+id/car_ui_toolbar_menu_item_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@null"
+ android:focusable="false"
+ android:clickable="false"/>
<com.android.car.ui.uxr.DrawableStateButton
android:id="@+id/car_ui_toolbar_menu_item_text"
style="@style/Widget.CarUi.Toolbar.TextButton"
