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

Merge "Revert the window context creation in NavigationBarController" into sc-v2-dev am: f00c623bfd

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15237632

Change-Id: I1630754d671838ca6c792cb92bb49a6054bac1c0
This commit is contained in:
Chris Li
2021-07-12 20:17:27 +00:00
committed by Automerger Merge Worker
parent ffa531ee09 f00c623bfd
commit bb3d8f601c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java
View File

@@ -17,7 +17,6 @@
package com.android.systemui.navigationbar; package com.android.systemui.navigationbar;
import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.DEFAULT_DISPLAY;
import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON;
import static com.android.systemui.shared.recents.utilities.Utilities.isTablet; import static com.android.systemui.shared.recents.utilities.Utilities.isTablet;
@@ -350,7 +349,9 @@ public class NavigationBarController implements Callbacks,
Log.w(TAG, "Cannot get WindowManager."); Log.w(TAG, "Cannot get WindowManager.");
return; return;
} }
final Context context = mContext.createWindowContext(display, TYPE_NAVIGATION_BAR, null); final Context context = isOnDefaultDisplay
? mContext
: mContext.createDisplayContext(display);
NavigationBar navBar = new NavigationBar(context, NavigationBar navBar = new NavigationBar(context,
mWindowManager, mWindowManager,
mAssistManagerLazy, mAssistManagerLazy,