diff --git a/packages/SystemUI/res/values/config_car.xml b/packages/SystemUI/res/values/config_car.xml index db829f25802e8..2c549bc8ce2d6 100644 --- a/packages/SystemUI/res/values/config_car.xml +++ b/packages/SystemUI/res/values/config_car.xml @@ -27,4 +27,5 @@ false false true + true diff --git a/packages/SystemUI/res/values/ids_car.xml b/packages/SystemUI/res/values/ids_car.xml new file mode 100644 index 0000000000000..27ed2e250d9f7 --- /dev/null +++ b/packages/SystemUI/res/values/ids_car.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java b/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java index 9459ce1ba8271..cc9fec04f01f7 100644 --- a/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java +++ b/packages/SystemUI/src/com/android/systemui/car/CarSystemUIFactory.java @@ -17,17 +17,29 @@ package com.android.systemui.car; import android.content.Context; import android.util.ArrayMap; +import android.view.View; +import com.android.internal.widget.LockPatternUtils; +import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.Dependency.DependencyProvider; import com.android.systemui.SystemUIFactory; import com.android.systemui.statusbar.NotificationEntryManager; import com.android.systemui.statusbar.car.CarFacetButtonController; +import com.android.systemui.statusbar.car.CarStatusBar; +import com.android.systemui.statusbar.car.CarStatusBarKeyguardViewManager; import com.android.systemui.statusbar.car.hvac.HvacController; +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; /** * Class factory to provide car specific SystemUI components. */ public class CarSystemUIFactory extends SystemUIFactory { + + public StatusBarKeyguardViewManager createStatusBarKeyguardViewManager(Context context, + ViewMediatorCallback viewMediatorCallback, LockPatternUtils lockPatternUtils) { + return new CarStatusBarKeyguardViewManager(context, viewMediatorCallback, lockPatternUtils); + } + @Override public void injectDependencies(ArrayMap providers, Context context) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java index 8160f9030bdeb..20986adbfe9f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarFacetButtonController.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.view.Display; +import android.view.View; import java.util.HashMap; import java.util.List; @@ -73,36 +74,43 @@ public class CarFacetButtonController { */ public void taskChanged(List stackInfoList) { int displayId = getDisplayId(); + ActivityManager.StackInfo validStackInfo = null; for (ActivityManager.StackInfo stackInfo :stackInfoList) { - // if the display id is known and does not match the stack we skip - if (displayId != -1 && displayId != stackInfo.displayId || - stackInfo.topActivity == null) { - continue; - } - - if (mSelectedFacetButton != null) { - mSelectedFacetButton.setSelected(false); - } - - String packageName = stackInfo.topActivity.getPackageName(); - CarFacetButton facetButton = findFacetButtongByComponentName(stackInfo.topActivity); - if (facetButton == null) { - facetButton = mButtonsByPackage.get(packageName); - } - - if (facetButton == null) { - String category = getPackageCategory(packageName); - if (category != null) { - facetButton = mButtonsByCategory.get(category); - } - } - - if (facetButton != null) { - facetButton.setSelected(true); - mSelectedFacetButton = facetButton; - return; + // If the display id is unknown or it matches the stack, it's valid for use + if ((displayId == -1 || displayId == stackInfo.displayId) && + stackInfo.topActivity != null) { + validStackInfo = stackInfo; + break; } } + + if (validStackInfo == null) { + // No stack was found that was on the same display as the facet buttons thus return + return; + } + + if (mSelectedFacetButton != null) { + mSelectedFacetButton.setSelected(false); + } + + String packageName = validStackInfo.topActivity.getPackageName(); + CarFacetButton facetButton = findFacetButtongByComponentName(validStackInfo.topActivity); + if (facetButton == null) { + facetButton = mButtonsByPackage.get(packageName); + } + + if (facetButton == null) { + String category = getPackageCategory(packageName); + if (category != null) { + facetButton = mButtonsByCategory.get(category); + } + } + + if (facetButton != null && facetButton.getVisibility() == View.VISIBLE) { + facetButton.setSelected(true); + mSelectedFacetButton = facetButton; + } + } private int getDisplayId() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java index b2cef16277f72..9ed0929749633 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java @@ -36,10 +36,11 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; * in a linear layout. */ class CarNavigationBarView extends LinearLayout { - private LinearLayout mNavButtons; + private View mNavButtons; private AlphaOptimizedImageButton mNotificationsButton; private CarStatusBar mCarStatusBar; private Context mContext; + private View mLockScreenButtons; public CarNavigationBarView(Context context, AttributeSet attrs) { super(context, attrs); @@ -49,6 +50,7 @@ class CarNavigationBarView extends LinearLayout { @Override public void onFinishInflate() { mNavButtons = findViewById(R.id.nav_buttons); + mLockScreenButtons = findViewById(R.id.lock_screen_nav_buttons); mNotificationsButton = findViewById(R.id.notifications); if (mNotificationsButton != null) { @@ -74,4 +76,28 @@ class CarNavigationBarView extends LinearLayout { protected void onNotificationsClick(View v) { mCarStatusBar.togglePanel(); } + + /** + * If there are buttons declared in the layout they will be shown and the normal + * Nav buttons will be hidden. + */ + public void showKeyguardButtons() { + if (mLockScreenButtons == null) { + return; + } + mLockScreenButtons.setVisibility(View.VISIBLE); + mNavButtons.setVisibility(View.GONE); + } + + /** + * If there are buttons declared in the layout they will be hidden and the normal + * Nav buttons will be shown. + */ + public void hideKeyguardButtons() { + if (mLockScreenButtons == null) { + return; + } + mNavButtons.setVisibility(View.VISIBLE); + mLockScreenButtons.setVisibility(View.GONE); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 9c60f5c60bd26..83021ca51a558 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -141,6 +141,52 @@ public class CarStatusBar extends StatusBar implements buildNavBarContent(); } + /** + * Allows for showing or hiding just the navigation bars. This is indented to be used when + * the full screen user selector is shown. + */ + void setNavBarVisibility(@View.Visibility int visibility) { + if (mNavigationBarWindow != null) { + mNavigationBarWindow.setVisibility(visibility); + } + if (mLeftNavigationBarWindow != null) { + mLeftNavigationBarWindow.setVisibility(visibility); + } + if (mRightNavigationBarWindow != null) { + mRightNavigationBarWindow.setVisibility(visibility); + } + } + + + @Override + public boolean hideKeyguard() { + boolean result = super.hideKeyguard(); + if (mNavigationBarView != null) { + mNavigationBarView.hideKeyguardButtons(); + } + if (mLeftNavigationBarView != null) { + mLeftNavigationBarView.hideKeyguardButtons(); + } + if (mRightNavigationBarView != null) { + mRightNavigationBarView.hideKeyguardButtons(); + } + return result; + } + + + @Override + public void showKeyguard() { + super.showKeyguard(); + if (mNavigationBarView != null) { + mNavigationBarView.showKeyguardButtons(); + } + if (mLeftNavigationBarView != null) { + mLeftNavigationBarView.showKeyguardButtons(); + } + if (mRightNavigationBarView != null) { + mRightNavigationBarView.showKeyguardButtons(); + } + } @Override public void destroy() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java new file mode 100644 index 0000000000000..7a8d22bee2d8e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBarKeyguardViewManager.java @@ -0,0 +1,31 @@ +package com.android.systemui.statusbar.car; + +import android.content.Context; +import android.view.View; + +import com.android.internal.widget.LockPatternUtils; +import com.android.keyguard.ViewMediatorCallback; +import com.android.systemui.R; +import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; + +public class CarStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager { + + protected boolean mShouldHideNavBar; + + public CarStatusBarKeyguardViewManager(Context context, + ViewMediatorCallback callback, + LockPatternUtils lockPatternUtils) { + super(context, callback, lockPatternUtils); + mShouldHideNavBar =context.getResources() + .getBoolean(R.bool.config_hideNavWhenKeyguardBouncerShown); + } + + @Override + protected void updateNavigationBarVisibility(boolean navBarVisible) { + if(!mShouldHideNavBar) { + return; + } + CarStatusBar statusBar = (CarStatusBar) mStatusBar; + statusBar.setNavBarVisibility(navBarVisible ? View.VISIBLE : View.GONE); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index e63a2e5f3d5c1..b517d11640375 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -586,20 +586,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb boolean navBarVisible = isNavBarVisible(); boolean lastNavBarVisible = getLastNavBarVisible(); if (navBarVisible != lastNavBarVisible || mFirstUpdate) { - if (mStatusBar.getNavigationBarView() != null) { - if (navBarVisible) { - long delay = getNavBarShowDelay(); - if (delay == 0) { - mMakeNavigationBarVisibleRunnable.run(); - } else { - mContainer.postOnAnimationDelayed(mMakeNavigationBarVisibleRunnable, - delay); - } - } else { - mContainer.removeCallbacks(mMakeNavigationBarVisibleRunnable); - mStatusBar.getNavigationBarView().getRootView().setVisibility(View.GONE); - } - } + updateNavigationBarVisibility(navBarVisible); } if (bouncerShowing != mLastBouncerShowing || mFirstUpdate) { @@ -626,6 +613,23 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mStatusBar.onKeyguardViewManagerStatesUpdated(); } + protected void updateNavigationBarVisibility(boolean navBarVisible) { + if (mStatusBar.getNavigationBarView() != null) { + if (navBarVisible) { + long delay = getNavBarShowDelay(); + if (delay == 0) { + mMakeNavigationBarVisibleRunnable.run(); + } else { + mContainer.postOnAnimationDelayed(mMakeNavigationBarVisibleRunnable, + delay); + } + } else { + mContainer.removeCallbacks(mMakeNavigationBarVisibleRunnable); + mStatusBar.getNavigationBarView().getRootView().setVisibility(View.GONE); + } + } + } + /** * @return Whether the navigation bar should be made visible based on the current state. */