From 6f7ad91eb54477cd1fefd92e514d614ad73bfbfe Mon Sep 17 00:00:00 2001 From: Brad Stenning Date: Mon, 9 Apr 2018 10:56:10 -0700 Subject: Missed setting default values Bug:77802818 Test: Manual Change-Id: I1776b8c197e9f91148748568c1529517d6437161 --- packages/SystemUI/res/layout/car_left_navigation_bar.xml | 2 +- .../SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml | 2 +- packages/SystemUI/res/layout/car_navigation_bar.xml | 2 +- packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml | 2 +- packages/SystemUI/res/layout/car_right_navigation_bar.xml | 2 +- .../SystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml | 2 +- .../src/com/android/systemui/statusbar/car/CarNavigationButton.java | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/SystemUI/res/layout/car_left_navigation_bar.xml b/packages/SystemUI/res/layout/car_left_navigation_bar.xml index 18301a83defd..02be45788761 100644 --- a/packages/SystemUI/res/layout/car_left_navigation_bar.xml +++ b/packages/SystemUI/res/layout/car_left_navigation_bar.xml @@ -40,7 +40,7 @@ android:id="@+id/home" android:layout_height="wrap_content" android:layout_width="match_parent" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingTop="30dp" diff --git a/packages/SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml b/packages/SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml index a65ff1693797..708f5955f306 100644 --- a/packages/SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml +++ b/packages/SystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml @@ -40,7 +40,7 @@ android:id="@+id/home" android:layout_height="wrap_content" android:layout_width="match_parent" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingTop="30dp" diff --git a/packages/SystemUI/res/layout/car_navigation_bar.xml b/packages/SystemUI/res/layout/car_navigation_bar.xml index 9ff16a23b10e..d568d0d3c179 100644 --- a/packages/SystemUI/res/layout/car_navigation_bar.xml +++ b/packages/SystemUI/res/layout/car_navigation_bar.xml @@ -38,7 +38,7 @@ android:id="@+id/home" android:layout_height="match_parent" android:layout_width="wrap_content" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingLeft="30dp" diff --git a/packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml b/packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml index b0488ae6382b..4ba6c06d80a1 100644 --- a/packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml +++ b/packages/SystemUI/res/layout/car_navigation_bar_unprovisioned.xml @@ -38,7 +38,7 @@ android:id="@+id/home" android:layout_height="match_parent" android:layout_width="wrap_content" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingLeft="30dp" diff --git a/packages/SystemUI/res/layout/car_right_navigation_bar.xml b/packages/SystemUI/res/layout/car_right_navigation_bar.xml index 99bd23cd4889..91ba02622e9a 100644 --- a/packages/SystemUI/res/layout/car_right_navigation_bar.xml +++ b/packages/SystemUI/res/layout/car_right_navigation_bar.xml @@ -40,7 +40,7 @@ android:id="@+id/home" android:layout_height="wrap_content" android:layout_width="match_parent" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingTop="30dp" diff --git a/packages/SystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml b/packages/SystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml index a65ff1693797..708f5955f306 100644 --- a/packages/SystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml +++ b/packages/SystemUI/res/layout/car_right_navigation_bar_unprovisioned.xml @@ -40,7 +40,7 @@ android:id="@+id/home" android:layout_height="wrap_content" android:layout_width="match_parent" - systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;end" + systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end" android:src="@drawable/car_ic_overview" android:background="?android:attr/selectableItemBackground" android:paddingTop="30dp" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java index e248db4b2a06..ec243fe98710 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java @@ -24,8 +24,8 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag private String mLongIntent; private boolean mBroadcastIntent; private boolean mSelected = false; - private float mSelectedAlpha; - private float mUnselectedAlpha; + private float mSelectedAlpha = 1f; + private float mUnselectedAlpha = 1f; private int mSelectedIconResourceId; private int mIconResourceId; -- cgit v1.2.3-59-g8ed1b