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

Merge "Changed car status bar to show or hide by setting layout height instead of removing/adding the view." into qt-qpr1-dev

Browse Source 
am: e6e2319970

Change-Id: I38aafe8fbcf39350c34482d977f48385aa0c2d33
This commit is contained in:
Jian-Yang Liu
2019-10-15 16:39:58 -07:00
committed by android-build-merger
parent a69d2946f0 e6e2319970
commit b1ceaefe77
1 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
View File

@@ -808,15 +808,25 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
}
boolean isKeyboardVisible = (vis & InputMethodService.IME_VISIBLE) != 0;
if (!isKeyboardVisible) {
attachBottomNavBarWindow();
} else {
detachBottomNavBarWindow();
}
showBottomNavBarWindow(isKeyboardVisible);
}
private void attachNavBarWindows() {
attachBottomNavBarWindow();
if (mShowBottom && !mBottomNavBarVisible) {
mBottomNavBarVisible = true;
WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
PixelFormat.TRANSLUCENT);
lp.setTitle("CarNavigationBar");
lp.windowAnimations = 0;
mWindowManager.addView(mNavigationBarWindow, lp);
}
if (mShowLeft) {
int width = mContext.getResources().getDimensionPixelSize(
@@ -854,47 +864,19 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
}
}
/**
* Attaches the bottom nav bar window. Can be extended to modify the specific behavior of
* attaching the bottom nav bar.
*/
protected void attachBottomNavBarWindow() {
private void showBottomNavBarWindow(boolean isKeyboardVisible) {
if (!mShowBottom) {
return;
}
if (mBottomNavBarVisible) {
return;
}
mBottomNavBarVisible = true;
WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
PixelFormat.TRANSLUCENT);
lp.setTitle("CarNavigationBar");
lp.windowAnimations = 0;
mWindowManager.addView(mNavigationBarWindow, lp);
}
/**
* Detaches the bottom nav bar window. Can be extended to modify the specific behavior of
* detaching the bottom nav bar.
*/
protected void detachBottomNavBarWindow() {
if (!mShowBottom) {
// If keyboard is visible and bottom nav bar not visible, this is the correct state, so do
// nothing. Same with if keyboard is not visible and bottom nav bar is visible.
if (isKeyboardVisible ^ mBottomNavBarVisible) {
return;
}
if (!mBottomNavBarVisible) {
return;
}
mBottomNavBarVisible = false;
mWindowManager.removeView(mNavigationBarWindow);
mNavigationBarWindow.setVisibility(isKeyboardVisible ? View.GONE : View.VISIBLE);
mBottomNavBarVisible = !isKeyboardVisible;
}
private void buildTopBar(int layout) {