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

Commit f00c623b authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

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

parents 0bf29bd3 db18b6e3

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,