Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d8c66bd authored by Victor Chan's avatar Victor Chan
Browse files

Use vector drawables for icons on car navbar 

Adjusting CarNavigationButton layout so that vector
drawables are properly scaled/rendered in the car navigation bar.

Change-Id: I71fdfd0d863049a63abf11c41f46c950ed7e309e
parent ec0c2d8f

packages/SystemUI/res/layout/car_navigation_button.xml

+5 −3
Original line number Diff line number Diff line
@@ -26,9 +26,10 @@ 
    <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/car_nav_button_icon"

            android:layout_height="match_parent"

            android:layout_width="wrap_content"

            android:layout_width="@dimen/car_navigation_button_width"

            android:layout_centerInParent="true"

            android:animateLayoutChanges="true">

            android:animateLayoutChanges="true"

            android:scaleType="fitCenter">

    </com.android.keyguard.AlphaOptimizedImageButton>



    <com.android.keyguard.AlphaOptimizedImageButton
@@ -37,6 +38,7 @@ 
            android:layout_width="wrap_content"

            android:layout_centerVertical="true"

            android:layout_toRightOf="@+id/car_nav_button_icon"

            android:animateLayoutChanges="true">

            android:animateLayoutChanges="true"

            android:scaleType="fitCenter">

    </com.android.keyguard.AlphaOptimizedImageButton>

</com.android.systemui.statusbar.car.CarNavigationButton>

packages/SystemUI/res/values/dimens_car.xml

+1 −0
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ 
    <dimen name="car_fullscreen_user_pod_image_avatar_width">128dp</dimen>

    <dimen name="car_fullscreen_user_pod_image_avatar_height">128dp</dimen>

    <dimen name="car_fullscreen_user_pod_text_size">24sp</dimen>

    <dimen name="car_navigation_button_width">64dp</dimen>

</resources>

packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java

+0 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.statusbar.car; 
import android.content.Context;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.widget.ImageButton;

import android.widget.ImageView;

import android.widget.RelativeLayout;

import com.android.keyguard.AlphaOptimizedImageButton;

import com.android.systemui.R;
@@ -43,13 +41,11 @@ public class CarNavigationButton extends RelativeLayout { 
        super.onFinishInflate();

        mIcon = (AlphaOptimizedImageButton) findViewById(R.id.car_nav_button_icon);

        mIcon.setClickable(false);

        mIcon.setScaleType(ImageView.ScaleType.CENTER);

        mIcon.setBackgroundColor(android.R.color.transparent);

        mIcon.setAlpha(UNSELECTED_ALPHA);



        mMoreIcon = (AlphaOptimizedImageButton) findViewById(R.id.car_nav_button_more_icon);

        mMoreIcon.setClickable(false);

        mMoreIcon.setScaleType(ImageView.ScaleType.CENTER);

        mMoreIcon.setBackgroundColor(android.R.color.transparent);

        mMoreIcon.setVisibility(INVISIBLE);

        mMoreIcon.setImageDrawable(getContext().getDrawable(R.drawable.car_ic_arrow));