diff options
| -rw-r--r-- | res/layout/appbar_view.xml | 5 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/com/android/car/media/widgets/AppBarView.java | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/res/layout/appbar_view.xml b/res/layout/appbar_view.xml index 9808aa8..fe2b233 100644 --- a/res/layout/appbar_view.xml +++ b/res/layout/appbar_view.xml @@ -77,15 +77,16 @@ app:layout_constraintEnd_toStartOf="@+id/settings" app:layout_goneMarginEnd="@dimen/appbar_view_control_buttons_margin_end"/> - <ImageView + <com.android.car.apps.common.UxrImageView android:id="@+id/settings" android:layout_width="@dimen/appbar_view_icon_touch_target_size" android:layout_height="@dimen/appbar_view_icon_touch_target_size" android:layout_marginEnd="@dimen/appbar_view_control_buttons_margin_end" android:padding="@dimen/appbar_view_icon_padding" - android:tint="@color/appbar_view_icon_tint" + android:tint="@color/appbar_view_settings_tint" android:src="@drawable/ic_settings" android:background="@drawable/appbar_view_icon_background" + app:carUxRestrictions="UX_RESTRICTIONS_NO_SETUP" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/row_separator" app:layout_constraintEnd_toStartOf="@+id/app_switch_container"/> diff --git a/res/values/colors.xml b/res/values/colors.xml index 60319f6..84bf321 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,6 +36,7 @@ <!-- appbar_view.xml --> <color name="appbar_view_icon_tint">@color/primary_app_icon_color</color> + <color name="appbar_view_settings_tint">@color/uxr_image_view_color_selector</color> <!-- fragment_metadata.xml --> <color name="fragment_metadata_queue_divider_color">@*android:color/car_list_divider_light diff --git a/src/com/android/car/media/widgets/AppBarView.java b/src/com/android/car/media/widgets/AppBarView.java index 438e87b..4162031 100644 --- a/src/com/android/car/media/widgets/AppBarView.java +++ b/src/com/android/car/media/widgets/AppBarView.java @@ -23,6 +23,7 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; +import com.android.car.apps.common.UxrImageView; import com.android.car.apps.common.widget.CarTabLayout; import com.android.car.media.R; import com.android.car.media.common.MediaAppSelectorWidget; @@ -45,7 +46,7 @@ public class AppBarView extends ConstraintLayout { private ViewGroup mNavIconContainer; private TextView mTitle; /** Visible if mHasSettings && mShowSettings. */ - private View mSettingsButton; + private UxrImageView mSettingsButton; private boolean mHasSettings; private boolean mShowSettings; private View mSearchButton; |