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

Commit ffe20eaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "adding the icon attr to CarNavigationButton"

parents 085b1a5c 4a13816b

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

+2 −6
Original line number Diff line number Diff line
@@ -70,13 +70,9 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag 
                R.styleable.CarNavigationButton_unselectedAlpha, mUnselectedAlpha);

        mSelectedIconResourceId = typedArray.getResourceId(

                R.styleable.CarNavigationButton_selectedIcon, mIconResourceId);

        mIconResourceId = typedArray.getResourceId(

                R.styleable.CarNavigationButton_icon, 0);

        typedArray.recycle();



        // ImageView attrs

        TypedArray a = context.obtainStyledAttributes(

                attrs, com.android.internal.R.styleable.ImageView);

        mIconResourceId = a.getResourceId(com.android.internal.R.styleable.ImageView_src, 0);

        a.recycle();

    }

packages/SystemUI/res/values/attrs_car.xml

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ 
        <attr name="unselectedAlpha" />

        <!-- icon to be rendered when in selected state -->

        <attr name="selectedIcon" />

        <!-- icon to be rendered (drawable) -->

        <attr name="icon"/>

    </declare-styleable>



    <!-- Custom attributes to configure hvac values -->