Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb3d8f60 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I1630754d671838ca6c792cb92bb49a6054bac1c0
parents ffa531ee f00c623b

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.navigationbar;



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 com.android.systemui.shared.recents.utilities.Utilities.isTablet;
@@ -350,7 +349,9 @@ public class NavigationBarController implements Callbacks, 
            Log.w(TAG, "Cannot get WindowManager.");

            return;

        }

        final Context context = mContext.createWindowContext(display, TYPE_NAVIGATION_BAR, null);

        final Context context = isOnDefaultDisplay

                ? mContext

                : mContext.createDisplayContext(display);

        NavigationBar navBar = new NavigationBar(context,

                mWindowManager,

                mAssistManagerLazy,