Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use vector drawables for icons on car navbar"

Browse Source
This commit is contained in:
Victor Chan
2016-01-26 23:16:20 +00:00
committed by Android (Google) Code Review
parent 9068fd387c 4d8c66bd36
commit a88abe084e
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/res/layout/car_navigation_button.xml
View File

@@ -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>

1
packages/SystemUI/res/values/dimens_car.xml
View File

@@ -28,4 +28,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>

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

@@ -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));