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

Fixed CarStatusBar to use Car's implementation of navigation bar.

Browse Source 
Resolves the issue where for Car we switched back to only showing
Phone's implementation of StatusBar rather than Car's.

Bug: 148078465
Test: Manual
Change-Id: Id1b342e3b7a0e9437422c1edd221f320d52927de
This commit is contained in:
JianYang Liu
2020-01-22 13:24:57 -08:00
committed by Jian-Yang Liu
parent 3e26863dac
commit a02c99ec54
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/CarSystemUI/res/layout/super_notification_shade.xml
View File

@@ -59,24 +59,6 @@
sysui:ignoreRightInset="true"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/status_bar_height"
android:orientation="vertical"
>
<FrameLayout
android:id="@+id/status_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
/>
<FrameLayout
android:id="@+id/car_top_navigation_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
<include layout="@layout/brightness_mirror"/>
<ViewStub android:id="@+id/fullscreen_user_switcher_stub"

19
packages/CarSystemUI/res/layout/super_status_bar.xml
View File

@@ -25,9 +25,22 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<FrameLayout
android:id="@+id/status_bar_container"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:orientation="vertical"
>
<FrameLayout
android:id="@+id/status_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
/>
<FrameLayout
android:id="@+id/car_top_navigation_bar_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</com.android.systemui.statusbar.phone.StatusBarWindowView>

2
packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java
View File

@@ -235,7 +235,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
private void buildNavBarWindows() {
mTopNavigationBarWindow = mSuperStatusBarViewFactory
.getNotificationShadeWindowView()
.getStatusBarWindowView()
.findViewById(R.id.car_top_navigation_bar_container);
mBottomNavigationBarWindow = mCarNavigationBarController.getBottomWindow();
mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow();